diff --git a/libdino/src/entity/message.vala b/libdino/src/entity/message.vala
index e41e3646..5574ed40 100644
--- a/libdino/src/entity/message.vala
+++ b/libdino/src/entity/message.vala
@@ -47,7 +47,7 @@ public class Message : Object {
     public Marked marked {
         get { return marked_; }
         set {
-            if (marked == Marked.RECEIVED && value == Marked.READ) return;
+            if (value == Marked.RECEIVED && marked == Marked.READ) return;
             marked_ = value;
         }
     }
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 28cd355d..876e4a66 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -55,7 +55,7 @@ compile_gresources(
     TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
     TYPE EMBED_C
     RESOURCES ${RESOURCE_LIST}
-    PREFIX /im/dino
+    PREFIX /im/dino/Dino
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
 )
 
diff --git a/main/src/ui/add_conversation/add_contact_dialog.vala b/main/src/ui/add_conversation/add_contact_dialog.vala
index 102cf18a..2e7830a3 100644
--- a/main/src/ui/add_conversation/add_contact_dialog.vala
+++ b/main/src/ui/add_conversation/add_contact_dialog.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/add_conversation/add_contact_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/add_conversation/add_contact_dialog.ui")]
 protected class AddContactDialog : Gtk.Dialog {
 
     public Account? account {
diff --git a/main/src/ui/add_conversation/add_groupchat_dialog.vala b/main/src/ui/add_conversation/add_groupchat_dialog.vala
index b18e9bbb..2ecc9e19 100644
--- a/main/src/ui/add_conversation/add_groupchat_dialog.vala
+++ b/main/src/ui/add_conversation/add_groupchat_dialog.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/add_conversation/add_groupchat_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/add_conversation/add_groupchat_dialog.ui")]
 protected class AddGroupchatDialog : Gtk.Dialog {
 
     [GtkChild] private Stack accounts_stack;
diff --git a/main/src/ui/add_conversation/conference_details_fragment.vala b/main/src/ui/add_conversation/conference_details_fragment.vala
index 13bf1c5a..5efcb593 100644
--- a/main/src/ui/add_conversation/conference_details_fragment.vala
+++ b/main/src/ui/add_conversation/conference_details_fragment.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/add_conversation/conference_details_fragment.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/add_conversation/conference_details_fragment.ui")]
 protected class ConferenceDetailsFragment : Box {
 
     public bool done {
diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala
index fa607841..958445b7 100644
--- a/main/src/ui/add_conversation/list_row.vala
+++ b/main/src/ui/add_conversation/list_row.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/add_conversation/list_row.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/add_conversation/list_row.ui")]
 public class ListRow : ListBoxRow {
 
     [GtkChild] public Image image;
diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala
index ae157d9b..e6f45ba1 100644
--- a/main/src/ui/add_conversation/select_jid_fragment.vala
+++ b/main/src/ui/add_conversation/select_jid_fragment.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/add_conversation/select_jid_fragment.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/add_conversation/select_jid_fragment.ui")]
 public class SelectJidFragment : Gtk.Box {
 
     public signal void add_jid();
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index e8424684..a506f511 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -20,7 +20,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
         Window.set_default_icon_name("im.dino.Dino");
 
         CssProvider provider = new CssProvider();
-        provider.load_from_resource("/im/dino/theme.css");
+        provider.load_from_resource("/im/dino/Dino/theme.css");
         StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         activate.connect(() => {
@@ -104,7 +104,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
         add_action(quit_action);
         set_accels_for_action("app.quit", new string[]{"<Ctrl>Q"});
 
-        Builder builder = new Builder.from_resource("/im/dino/menu_app.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/menu_app.ui");
         MenuModel menu = builder.get_object("menu_app") as MenuModel;
 
         set_app_menu(menu);
diff --git a/main/src/ui/chat_input/encryption_button.vala b/main/src/ui/chat_input/encryption_button.vala
index 6ae3e8af..5fdcdaf7 100644
--- a/main/src/ui/chat_input/encryption_button.vala
+++ b/main/src/ui/chat_input/encryption_button.vala
@@ -17,7 +17,7 @@ public class EncryptionButton : MenuButton {
         image = new Image.from_icon_name("changes-allow-symbolic", IconSize.BUTTON);
         get_style_context().add_class("flat");
 
-        Builder builder = new Builder.from_resource("/im/dino/menu_encryption.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/menu_encryption.ui");
         popover = builder.get_object("menu_encryption") as PopoverMenu;
         Box encryption_box = builder.get_object("encryption_box") as Box;
         button_unencrypted = builder.get_object("button_unencrypted") as RadioButton;
diff --git a/main/src/ui/chat_input/view.vala b/main/src/ui/chat_input/view.vala
index ef749505..9b4a585c 100644
--- a/main/src/ui/chat_input/view.vala
+++ b/main/src/ui/chat_input/view.vala
@@ -7,7 +7,7 @@ using Xmpp;
 
 namespace Dino.Ui.ChatInput {
 
-[GtkTemplate (ui = "/im/dino/chat_input.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/chat_input.ui")]
 public class View : Box {
 
     [GtkChild] private ScrolledWindow scrolled;
diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala
index 61044857..422a0e0e 100644
--- a/main/src/ui/contact_details/dialog.vala
+++ b/main/src/ui/contact_details/dialog.vala
@@ -7,7 +7,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ContactDetails {
 
-[GtkTemplate (ui = "/im/dino/contact_details_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/contact_details_dialog.ui")]
 public class Dialog : Gtk.Dialog {
 
     [GtkChild] public Image avatar;
diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala
index e499c6d5..65515019 100644
--- a/main/src/ui/conversation_list_titlebar.vala
+++ b/main/src/ui/conversation_list_titlebar.vala
@@ -4,7 +4,7 @@ using Dino.Entities;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/conversation_list_titlebar.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/conversation_list_titlebar.ui")]
 public class ConversationListTitlebar : Gtk.HeaderBar {
 
     public signal void conversation_opened(Conversation conversation);
@@ -44,7 +44,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar {
         });
         GLib.Application.get_default().add_action(conference_action);
 
-        Builder builder = new Builder.from_resource("/im/dino/menu_add.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/menu_add.ui");
         MenuModel menu = builder.get_object("menu_add") as MenuModel;
         add_button.set_menu_model(menu);
     }
diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala
index 73636a19..692ad1a5 100644
--- a/main/src/ui/conversation_selector/chat_row.vala
+++ b/main/src/ui/conversation_selector/chat_row.vala
@@ -34,7 +34,7 @@ public class ChatRow : ConversationRow {
     }
 
     private Widget generate_tooltip() {
-        Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_selector/chat_row_tooltip.ui");
         Box main_box = builder.get_object("main_box") as Box;
         Box inner_box = builder.get_object("inner_box") as Box;
         Label jid_label = builder.get_object("jid_label") as Label;
diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala
index 64b2aeaf..45e7277a 100644
--- a/main/src/ui/conversation_selector/conversation_row.vala
+++ b/main/src/ui/conversation_selector/conversation_row.vala
@@ -7,7 +7,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ConversationSelector {
 
-[GtkTemplate (ui = "/im/dino/conversation_selector/conversation_row.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/conversation_row.ui")]
 public abstract class ConversationRow : ListBoxRow {
 
     public signal void closed();
diff --git a/main/src/ui/conversation_selector/groupchat_pm_row.vala b/main/src/ui/conversation_selector/groupchat_pm_row.vala
index 7e9e486b..00898f0c 100644
--- a/main/src/ui/conversation_selector/groupchat_pm_row.vala
+++ b/main/src/ui/conversation_selector/groupchat_pm_row.vala
@@ -29,7 +29,7 @@ public class GroupchatPmRow : ConversationRow {
     }
 
     private Widget generate_tooltip() {
-        Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_selector/chat_row_tooltip.ui");
         Box main_box = builder.get_object("main_box") as Box;
         Box inner_box = builder.get_object("inner_box") as Box;
         Label jid_label = builder.get_object("jid_label") as Label;
diff --git a/main/src/ui/conversation_selector/view.vala b/main/src/ui/conversation_selector/view.vala
index fabf5229..b6b02848 100644
--- a/main/src/ui/conversation_selector/view.vala
+++ b/main/src/ui/conversation_selector/view.vala
@@ -6,7 +6,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ConversationSelector {
 
-[GtkTemplate (ui = "/im/dino/conversation_selector/view.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/view.ui")]
 public class View : Box {
     public List conversation_list;
 
diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
index c31b7901..aa18c9d8 100644
--- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala
+++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
@@ -7,7 +7,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ConversationSummary {
 
-[GtkTemplate (ui = "/im/dino/conversation_summary/message_item.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/message_item.ui")]
 public class ConversationItemSkeleton : Grid {
 
     [GtkChild] private Image image;
diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala
index c50a5e3c..37412335 100644
--- a/main/src/ui/conversation_summary/conversation_view.vala
+++ b/main/src/ui/conversation_summary/conversation_view.vala
@@ -6,7 +6,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ConversationSummary {
 
-[GtkTemplate (ui = "/im/dino/conversation_summary/view.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/view.ui")]
 public class ConversationView : Box, Plugins.ConversationItemCollection {
 
     public Conversation? conversation { get; private set; }
diff --git a/main/src/ui/conversation_summary/file_populator.vala b/main/src/ui/conversation_summary/file_populator.vala
index 0edad19e..4dc6aaec 100644
--- a/main/src/ui/conversation_summary/file_populator.vala
+++ b/main/src/ui/conversation_summary/file_populator.vala
@@ -100,7 +100,7 @@ public class ImageItem : Plugins.MetaConversationItem {
         Util.image_set_from_scaled_pixbuf(image, pixbuf);
         Util.force_css(image, "* { box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.1); margin: 2px; border-radius: 3px; }");
 
-        Builder builder = new Builder.from_resource("/im/dino/conversation_summary/image_toolbar.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_summary/image_toolbar.ui");
         Widget toolbar = builder.get_object("main") as Widget;
         Util.force_background(toolbar, "rgba(0, 0, 0, 0.5)");
         Util.force_css(toolbar, "* { padding: 3px; border-radius: 3px; }");
diff --git a/main/src/ui/conversation_titlebar/menu_entry.vala b/main/src/ui/conversation_titlebar/menu_entry.vala
index 51b8051c..e77204a8 100644
--- a/main/src/ui/conversation_titlebar/menu_entry.vala
+++ b/main/src/ui/conversation_titlebar/menu_entry.vala
@@ -29,7 +29,7 @@ class MenuWidget : MenuButton, Plugins.ConversationTitlebarWidget {
     public MenuWidget(StreamInteractor stream_interactor) {
         image = new Image.from_icon_name("open-menu-symbolic", IconSize.MENU);
 
-        Builder builder = new Builder.from_resource("/im/dino/menu_conversation.ui");
+        Builder builder = new Builder.from_resource("/im/dino/Dino/menu_conversation.ui");
         MenuModel menu = builder.get_object("menu_conversation") as MenuModel;
         set_menu_model(menu);
 
diff --git a/main/src/ui/manage_accounts/account_row.vala b/main/src/ui/manage_accounts/account_row.vala
index 8ac2c213..04fad66f 100644
--- a/main/src/ui/manage_accounts/account_row.vala
+++ b/main/src/ui/manage_accounts/account_row.vala
@@ -4,7 +4,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ManageAccounts {
 
-[GtkTemplate (ui = "/im/dino/manage_accounts/account_row.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/account_row.ui")]
 public class AccountRow :  Gtk.ListBoxRow {
 
     [GtkChild] public Image image;
diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala
index 5e3f3859..3bd9cc4b 100644
--- a/main/src/ui/manage_accounts/add_account_dialog.vala
+++ b/main/src/ui/manage_accounts/add_account_dialog.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ManageAccounts {
 
-[GtkTemplate (ui = "/im/dino/manage_accounts/add_account_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/add_account_dialog.ui")]
 public class AddAccountDialog : Gtk.Dialog {
 
     public signal void added(Account account);
diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala
index f2228cea..dd2383a2 100644
--- a/main/src/ui/manage_accounts/dialog.vala
+++ b/main/src/ui/manage_accounts/dialog.vala
@@ -7,7 +7,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.ManageAccounts {
 
-[GtkTemplate (ui = "/im/dino/manage_accounts/dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/dialog.ui")]
 public class Dialog : Gtk.Dialog {
 
     public signal void account_enabled(Account account);
diff --git a/main/src/ui/occupant_menu/list.vala b/main/src/ui/occupant_menu/list.vala
index 904ab3a7..e89cd3d8 100644
--- a/main/src/ui/occupant_menu/list.vala
+++ b/main/src/ui/occupant_menu/list.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Ui.OccupantMenu{
 
-[GtkTemplate (ui = "/im/dino/occupant_list.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/occupant_list.ui")]
 public class List : Box {
 
     public signal void conversation_selected(Conversation? conversation);
diff --git a/main/src/ui/occupant_menu/list_row.vala b/main/src/ui/occupant_menu/list_row.vala
index c7536f9c..762c281b 100644
--- a/main/src/ui/occupant_menu/list_row.vala
+++ b/main/src/ui/occupant_menu/list_row.vala
@@ -5,7 +5,7 @@ using Xmpp;
 
 namespace Dino.Ui.OccupantMenu {
 
-[GtkTemplate (ui = "/im/dino/occupant_list_item.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/occupant_list_item.ui")]
 public class ListRow : ListBoxRow {
 
     [GtkChild] private Image image;
diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala
index e4b2a95f..e40b2993 100644
--- a/main/src/ui/settings_dialog.vala
+++ b/main/src/ui/settings_dialog.vala
@@ -2,7 +2,7 @@ using Gtk;
 
 namespace Dino.Ui {
 
-[GtkTemplate (ui = "/im/dino/settings_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/settings_dialog.ui")]
 class SettingsDialog : Dialog {
 
     [GtkChild] private CheckButton typing_checkbutton;
diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala
index 06dde74f..15218e17 100644
--- a/main/src/ui/unified_window.vala
+++ b/main/src/ui/unified_window.vala
@@ -149,7 +149,7 @@ public class NoConversationsPlaceholder : UnifiedWindowPlaceholder {
     }
 }
 
-[GtkTemplate (ui = "/im/dino/unified_window_placeholder.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/unified_window_placeholder.ui")]
 public class UnifiedWindowPlaceholder : Box {
     [GtkChild] public Label label;
     [GtkChild] public Button primary_button;
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index eb64cbd2..50cd6627 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -21,7 +21,7 @@ compile_gresources(
     TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
     TYPE EMBED_C
     RESOURCES ${RESOURCE_LIST}
-    PREFIX /im/dino/omemo
+    PREFIX /im/dino/Dino/omemo
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
 )
 
@@ -62,4 +62,4 @@ target_link_libraries(omemo libdino signal-protocol-vala ${OMEMO_PACKAGES})
 set_target_properties(omemo PROPERTIES PREFIX "")
 set_target_properties(omemo PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/)
 
-install(TARGETS omemo ${PLUGIN_INSTALL})
\ No newline at end of file
+install(TARGETS omemo ${PLUGIN_INSTALL})
diff --git a/plugins/omemo/src/account_settings_dialog.vala b/plugins/omemo/src/account_settings_dialog.vala
index eebdfc8a..d77b9df3 100644
--- a/plugins/omemo/src/account_settings_dialog.vala
+++ b/plugins/omemo/src/account_settings_dialog.vala
@@ -4,7 +4,7 @@ using Dino.Entities;
 
 namespace Dino.Plugins.Omemo {
 
-[GtkTemplate (ui = "/im/dino/omemo/account_settings_dialog.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/omemo/account_settings_dialog.ui")]
 public class AccountSettingsDialog : Gtk.Dialog {
 
     private Plugin plugin;
diff --git a/plugins/openpgp/CMakeLists.txt b/plugins/openpgp/CMakeLists.txt
index 037a4b51..ab406123 100644
--- a/plugins/openpgp/CMakeLists.txt
+++ b/plugins/openpgp/CMakeLists.txt
@@ -22,7 +22,7 @@ compile_gresources(
     TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
     TYPE EMBED_C
     RESOURCES ${RESOURCE_LIST}
-    PREFIX /im/dino
+    PREFIX /im/dino/Dino/openpgp
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
 )
 
diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala
index b71a1eda..2a6b99ac 100644
--- a/plugins/openpgp/src/account_settings_widget.vala
+++ b/plugins/openpgp/src/account_settings_widget.vala
@@ -5,7 +5,7 @@ using Dino.Entities;
 
 namespace Dino.Plugins.OpenPgp {
 
-[GtkTemplate (ui = "/im/dino/account_settings_item.ui")]
+[GtkTemplate (ui = "/im/dino/Dino/openpgp/account_settings_item.ui")]
 
 private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
     [GtkChild] private Label label;