diff --git a/debian/zoitechat-common.install b/debian/zoitechat-common.install
new file mode 100644
index 00000000..ead106bb
--- /dev/null
+++ b/debian/zoitechat-common.install
@@ -0,0 +1,7 @@
+usr/share/applications/net.zoite.Zoitechat.desktop
+usr/share/dbus-1/services/org.zoitechat.service.service
+usr/share/icons/hicolor/48x48/apps/net.zoite.Zoitechat.png
+usr/share/icons/hicolor/scalable/apps/net.zoite.Zoitechat.svg
+usr/share/locale/*/LC_MESSAGES/zoitechat.mo
+usr/share/metainfo/net.zoite.Zoitechat.appdata.xml
+usr/share/mime/packages/net.zoite.Zoitechat.mime.xml
diff --git a/debian/zoitechat-dev.install b/debian/zoitechat-dev.install
new file mode 100644
index 00000000..241521a0
--- /dev/null
+++ b/debian/zoitechat-dev.install
@@ -0,0 +1,2 @@
+usr/include/zoitechat-plugin.h
+usr/lib/*/pkgconfig/zoitechat-plugin.pc
diff --git a/debian/zoitechat-lua.install b/debian/zoitechat-lua.install
new file mode 100644
index 00000000..67f1a7a2
--- /dev/null
+++ b/debian/zoitechat-lua.install
@@ -0,0 +1 @@
+usr/lib/*/zoitechat/plugins/lua.so
diff --git a/debian/zoitechat-perl.install b/debian/zoitechat-perl.install
new file mode 100644
index 00000000..66ef1f87
--- /dev/null
+++ b/debian/zoitechat-perl.install
@@ -0,0 +1 @@
+usr/lib/*/zoitechat/plugins/perl.so
diff --git a/debian/zoitechat-plugins.install b/debian/zoitechat-plugins.install
new file mode 100644
index 00000000..23786ab0
--- /dev/null
+++ b/debian/zoitechat-plugins.install
@@ -0,0 +1,3 @@
+usr/lib/*/zoitechat/plugins/checksum.so
+usr/lib/*/zoitechat/plugins/fishlim.so
+usr/lib/*/zoitechat/plugins/sysinfo.so
diff --git a/debian/zoitechat-python3.install b/debian/zoitechat-python3.install
new file mode 100644
index 00000000..a82457d3
--- /dev/null
+++ b/debian/zoitechat-python3.install
@@ -0,0 +1,4 @@
+usr/lib/*/zoitechat/plugins/python.so
+usr/lib/*/zoitechat/python/_zoitechat.py
+usr/lib/*/zoitechat/python/xchat.py
+usr/lib/*/zoitechat/python/zoitechat.py
diff --git a/debian/zoitechat.install b/debian/zoitechat.install
index f7469322..32e2a8f6 100644
--- a/debian/zoitechat.install
+++ b/debian/zoitechat.install
@@ -1,5 +1,2 @@
 usr/bin/zoitechat
-usr/share/applications
 usr/share/man/man1/zoitechat.1
-usr/share/metainfo/net.zoite.Zoitechat.appdata.xml
-usr/share/mime/packages/net.zoite.Zoitechat.mime.xml
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index bc7f5d45..0402e27e 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -2816,7 +2816,7 @@ setup_apply_to_sess (session_gui *gui)
 			bg = &colors[COL_BG];
 		if (fe_dark_mode_is_enabled ())
 			fg = &colors[COL_FG];
-		if (prefs.hex_gui_ulist_style)
+		if (input_style)
 			font = input_style->font_desc;
 
 		gtkutil_apply_palette (gui->user_tree, bg, fg, font);