diff --git a/build-aux/flatpak/org.gnome.Gtranslator.json b/build-aux/flatpak/org.gnome.Gtranslator.json
index 2c0551c671f581e7301e9ddee9d4e5f415e40715..aaf59b4433ab74d0ca4e85c7dc17d954b325731d 100644
--- a/build-aux/flatpak/org.gnome.Gtranslator.json
+++ b/build-aux/flatpak/org.gnome.Gtranslator.json
@@ -9,6 +9,7 @@
     ],
     "desktop-file-name-suffix" : "(Development) ",
     "finish-args" : [
+        "--device=dri",
         "--share=ipc",
         "--share=network",
         "--socket=fallback-x11",
diff --git a/data/org.gnome.Gtranslator.gschema.xml.in b/data/org.gnome.Gtranslator.gschema.xml.in
index 0605235533acfbc162134df6afe8ccd0843e3236..da3467eb7bf157902fcc7d7ab24b9df74659eaea 100644
--- a/data/org.gnome.Gtranslator.gschema.xml.in
+++ b/data/org.gnome.Gtranslator.gschema.xml.in
@@ -105,13 +105,6 @@
         Style for switchers in the side panel.
       </description>
     </key>
-    <key name="color-scheme" type="s">
-      <default>'classic'</default>
-      <summary>Color scheme</summary>
-      <description>
-        Name of a gtksourceview color scheme to use for syntax highlighting.
-      </description>
-    </key>
     <key name="sort-order" type="s">
       <default>'id'</default>
       <summary>Message list sort order</summary>
diff --git a/src/codeview/gtr-viewer.c b/src/codeview/gtr-viewer.c
index 418f772d787dca9942d1905c2a44109cf3b662d5..35a5731d3d8997692fbcdbbc664289aecb816c40 100644
--- a/src/codeview/gtr-viewer.c
+++ b/src/codeview/gtr-viewer.c
@@ -47,6 +47,40 @@ struct _GtrViewer
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrViewer, gtr_viewer, GTK_TYPE_WINDOW)
 
+static void
+source_view_update_theme (GtrViewer *dlg)
+{
+  AdwStyleManager *manager;
+  GtkSourceStyleSchemeManager *scheme_manager;
+  GtkSourceStyleScheme *scheme;
+  const gchar *scheme_name;
+  GtkSourceView *view;
+  GtkTextBuffer *buffer;
+  GtrViewerPrivate *priv = gtr_viewer_get_instance_private (dlg);
+
+  view = GTK_SOURCE_VIEW (priv->view);
+
+  manager = adw_style_manager_get_default ();
+
+  if (adw_style_manager_get_dark (manager))
+    scheme_name = "Adwaita-dark";
+  else
+    scheme_name = "Adwaita";
+
+  scheme_manager = gtk_source_style_scheme_manager_get_default ();
+  scheme = gtk_source_style_scheme_manager_get_scheme (scheme_manager,
+                                                       scheme_name);
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+  gtk_source_buffer_set_style_scheme (GTK_SOURCE_BUFFER (buffer), scheme);
+}
+
+static void
+notify_dark_cb (GtrViewer *dlg)
+{
+  source_view_update_theme (dlg);
+}
+
 static void
 gtr_viewer_init (GtrViewer *dlg)
 {
@@ -59,6 +93,7 @@ gtr_viewer_init (GtrViewer *dlg)
   };
   GtrViewerPrivate *priv = gtr_viewer_get_instance_private (dlg);
   GError *error = NULL;
+  AdwStyleManager *manager;
 
   gtk_window_set_title (GTK_WINDOW (dlg), _("Source Viewer"));
   gtk_window_set_default_size (GTK_WINDOW (dlg), 800, 600);
@@ -99,6 +134,11 @@ gtr_viewer_init (GtrViewer *dlg)
 
   /* Source view */
   priv->view = gtk_source_view_new ();
+  source_view_update_theme (dlg);
+  manager = adw_style_manager_get_default ();
+  g_signal_connect_swapped (manager, "notify::dark",
+                            G_CALLBACK (notify_dark_cb), dlg);
+
   gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->view), FALSE);
   gtk_widget_set_visible (priv->view, TRUE);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), priv->view);
diff --git a/src/codeview/gtr-viewer.ui b/src/codeview/gtr-viewer.ui
index 660fd75a9d3014fe268a7d50c8cf5f068260532f..99a3c25accd34ca726d65bf0450595b9d732d476 100644
--- a/src/codeview/gtr-viewer.ui
+++ b/src/codeview/gtr-viewer.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkDialog" id="dialog1">
-    <property name="can_focus">False</property>
     <property name="margin_start">6</property>
     <property name="margin_end">6</property>
     <property name="margin_top">6</property>
@@ -12,20 +11,17 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkBox" id="main_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="filename_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Source code</property>
                 <attributes>
@@ -36,7 +32,6 @@
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="vexpand">True</property>
                 <child>
                   <placeholder/>
diff --git a/src/gtr-application.c b/src/gtr-application.c
index 9b6486946d12d49c54f5f1a2bf344dc564eb637a..ddc77cfd12775e0fc4d100436164cf103bff587c 100644
--- a/src/gtr-application.c
+++ b/src/gtr-application.c
@@ -596,11 +596,12 @@ gtr_application_startup (GApplication *application)
   GtrApplication *app = GTR_APPLICATION (application);
   GtrApplicationPrivate *priv = gtr_application_get_instance_private (app);
 
-  g_application_set_resource_base_path (application, "/org/gnome/translator");
   G_APPLICATION_CLASS (gtr_application_parent_class)->startup (application);
   g_set_application_name (_("Translation Editor"));
   gtk_window_set_default_icon_name (PACKAGE_APPID);
 
+  gtk_source_init ();
+
   /* Custom css */
   priv->provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_resource (priv->provider, "/org/gnome/translator/styles.css");
@@ -608,9 +609,6 @@ gtr_application_startup (GApplication *application)
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (priv->provider), 600);
 
-  adw_style_manager_set_color_scheme (adw_style_manager_get_default (),
-                                      ADW_COLOR_SCHEME_PREFER_LIGHT);
-
   g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries,
                                    G_N_ELEMENTS (app_entries), application);
 
@@ -677,10 +675,6 @@ gtr_application_setup_window (GApplication *application,
   window = gtr_application_create_window (GTR_APPLICATION (application));
   gtk_application_add_window (GTK_APPLICATION (application), GTK_WINDOW (window));
 
-  /** loading custom styles **/
-  if (g_strrstr (PACKAGE_APPID, "Devel") != NULL)
-    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
-
   /* If it is the first run, the default directory was created in this
    * run, then we show the First run greeter
    */
@@ -738,6 +732,7 @@ gtr_application_new ()
   return GTR_APPLICATION (g_object_new (GTR_TYPE_APPLICATION,
                                         "application-id", PACKAGE_APPID,
                                         "flags", G_APPLICATION_HANDLES_OPEN,
+                                        "resource-base-path", "/org/gnome/translator/",
                                         NULL));
 }
 
diff --git a/src/gtr-context.ui b/src/gtr-context.ui
index 7933c68d16109418a806fbefbc19c4c85c871af1..71f863f7c7f9977039392ae802594c7f2ba3b0eb 100644
--- a/src/gtr-context.ui
+++ b/src/gtr-context.ui
@@ -15,7 +15,6 @@
     <child>
       <object class="GtkScrolledWindow" id="sw">
         <property name="vexpand">1</property>
-        <property name="focusable">1</property>
         <property name="child">
           <object class="GtkBox" id="context_box">
             <property name="margin-start">6</property>
@@ -45,7 +44,6 @@
             </child>
             <child>
               <object class="GtkTextView" id="notes">
-                <property name="focusable">1</property>
                 <property name="editable">0</property>
                 <property name="wrap_mode">word</property>
                 <property name="buffer">notesbuffer</property>
@@ -62,7 +60,6 @@
             </child>
             <child>
               <object class="GtkTextView" id="comments">
-                <property name="focusable">1</property>
                 <property name="editable">0</property>
                 <property name="wrap_mode">word</property>
                 <property name="buffer">commentsbuffer</property>
@@ -79,7 +76,6 @@
             </child>
             <child>
               <object class="GtkListBox" id="paths">
-                <property name="focusable">1</property>
               </object>
             </child>
           </object>
diff --git a/src/gtr-dl-teams.ui b/src/gtr-dl-teams.ui
index 446cbf2933a0f8e605f735919e045235ff46a3a4..2939f930cc9643c8f8c8c836ea74ac5da9724e30 100644
--- a/src/gtr-dl-teams.ui
+++ b/src/gtr-dl-teams.ui
@@ -21,10 +21,6 @@
       <attribute name='label' translatable='yes'>About Translation Editor</attribute>
       <attribute name='action'>app.about</attribute>
     </item>
-    <item>
-      <attribute name='label' translatable='yes'>Quit</attribute>
-      <attribute name='action'>app.quit</attribute>
-    </item>
   </section>
   </menu>
 
@@ -163,8 +159,8 @@
 
             <child>
               <object class="GtkButton" id="load_button">
-                <property name="label" translatable="1">Load file</property>
-                <property name="halign">end</property>
+                <property name="label" translatable="yes">Load File</property>
+                <property name="halign">center</property>
                 <style>
                   <class name="pill"/>
                   <class name="suggested-action"/>
@@ -187,17 +183,11 @@
     </child>
     <child type="end">
       <object class="GtkMenuButton" id="main_menu">
-        <property name="focusable">1</property>
         <property name="receives_default">1</property>
         <property name="popover">main_menu_popover</property>
-        <child>
-          <object class="GtkImage">
-            <property name="icon_name">open-menu-symbolic</property>
-          </object>
-        </child>
-        <accessibility>
-          <property name="label" translatable="yes">Main Menu</property>
-        </accessibility>
+        <property name="icon_name">open-menu-symbolic</property>
+        <property name="primary">True</property>
+        <property name="tooltip-text" translatable="yes">Main Menu</property>
       </object>
     </child>
   </object>
diff --git a/src/gtr-message-table.ui b/src/gtr-message-table.ui
index 5cf479b093be25575fcbd44b71577464bdd7e93b..49c74e5a293a47426deff4d3abc9be4f4ab54baa 100644
--- a/src/gtr-message-table.ui
+++ b/src/gtr-message-table.ui
@@ -53,7 +53,6 @@
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="vexpand">1</property>
-        <property name="focusable">1</property>
         <property name="child">
 
           <object class="GtkListView" id="messages">
diff --git a/src/gtr-preferences-dialog.c b/src/gtr-preferences-dialog.c
index cba4d2d27bc6f437aa972dbbdf4975acc48f43e2..5f93cf73531d82b4a72d96d229d44c153963bfab 100644
--- a/src/gtr-preferences-dialog.c
+++ b/src/gtr-preferences-dialog.c
@@ -265,10 +265,10 @@ create_profile_row (GtrPreferencesDialog *dlg,
 
   // MenuButton
   gmenu = g_menu_new ();
-  gitem = g_menu_item_new (_("edit"), "profile.edit");
+  gitem = g_menu_item_new (_("Edit"), "profile.edit");
   g_menu_item_set_action_and_target (gitem, "profile.edit", "s", profile_name);
   g_menu_append_item (gmenu, gitem);
-  gitem = g_menu_item_new (_("delete"), "profile.delete");
+  gitem = g_menu_item_new (_("Delete"), "profile.delete");
   g_menu_item_set_action_and_target (gitem, "profile.delete", "s", profile_name);
   g_menu_append_item (gmenu, gitem);
 
@@ -277,6 +277,7 @@ create_profile_row (GtrPreferencesDialog *dlg,
   gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu), G_MENU_MODEL (gmenu));
   gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (menu), "view-more-symbolic");
   adw_action_row_add_suffix (ADW_ACTION_ROW (row), menu);
+  gtk_widget_add_css_class (menu, "flat");
 
   adw_action_row_set_activatable_widget (ADW_ACTION_ROW (row), check);
 
diff --git a/src/gtr-projects.ui b/src/gtr-projects.ui
index 1cfa39fc3a4cc9359ab87c7a76bf9373dfb3abea..e6a0fad0f6a4d0f1d9cbf1d5c32edf8888e1b438 100644
--- a/src/gtr-projects.ui
+++ b/src/gtr-projects.ui
@@ -21,17 +21,13 @@
       <attribute name='label' translatable='yes'>Keyboard Shortcuts</attribute>
       <attribute name='action'>win.show-help-overlay</attribute>
     </item>
-    <item>
-      <attribute name='label' translatable='yes'>About Translation Editor</attribute>
-      <attribute name='action'>app.about</attribute>
-    </item>
     <item>
       <attribute name='label' translatable='yes'>Help</attribute>
       <attribute name='action'>app.help</attribute>
     </item>
     <item>
-      <attribute name='label' translatable='yes'>Quit</attribute>
-      <attribute name='action'>app.quit</attribute>
+      <attribute name='label' translatable='yes'>About Translation Editor</attribute>
+      <attribute name='action'>app.about</attribute>
     </item>
   </section>
   </menu>
@@ -64,9 +60,8 @@
         <property name="receives_default">1</property>
         <property name="popover">main_menu_popover</property>
         <property name="icon_name">open-menu-symbolic</property>
-        <accessibility>
-          <property name="label" translatable="yes">Main Menu</property>
-        </accessibility>
+        <property name="primary">True</property>
+        <property name="tooltip-text" translatable="yes">Main Menu</property>
       </object>
     </child>
   </object>
diff --git a/src/gtr-settings.c b/src/gtr-settings.c
index d47f818efdd8bd89cdca2a25b04792f109d0cf01..0cc6eef7b7a728232fce63ab8da082be1343c86a 100644
--- a/src/gtr-settings.c
+++ b/src/gtr-settings.c
@@ -186,21 +186,6 @@ on_font_changed (GSettings * settings,
   g_list_free (views);
 }
 
-static void
-on_scheme_changed (GSettings * settings, const gchar * key, GtrSettings * gs)
-{
-  GList *views, *l;
-
-  views = gtr_application_get_views (GTR_APP, TRUE, TRUE);
-
-  for (l = views; l != NULL; l = g_list_next (l))
-    {
-      gtr_view_reload_scheme_color (GTR_VIEW (l->data));
-    }
-
-  g_list_free (views);
-}
-
 static void
 gtr_settings_init (GtrSettings * gs)
 {
@@ -231,9 +216,6 @@ gtr_settings_init (GtrSettings * gs)
   g_signal_connect (priv->editor,
                     "changed::spellcheck",
                     G_CALLBACK (on_spellcheck_changed), gs);
-  g_signal_connect (priv->ui,
-                    "changed::color-scheme",
-                    G_CALLBACK (on_scheme_changed), gs);
   g_signal_connect (priv->editor,
                     "changed::font",
                     G_CALLBACK (on_font_changed), gs);
diff --git a/src/gtr-settings.h b/src/gtr-settings.h
index 9f0afa9296425184dbcbb3f3953f2181045be987..5ed11643775830bd3789eece63c111f3db2fb1e5 100644
--- a/src/gtr-settings.h
+++ b/src/gtr-settings.h
@@ -68,7 +68,6 @@ GSettings               *gtr_settings_new                       (void);
 #define GTR_SETTINGS_SPELLCHECK				"spellcheck"
 #define GTR_SETTINGS_FONT				"font"
 #define GTR_SETTINGS_PANEL_SWITCHER_STYLE		"panel-switcher-style"
-#define GTR_SETTINGS_COLOR_SCHEME			"color-scheme"
 #define GTR_SETTINGS_SORT_ORDER				"sort-order"
 #define GTR_SETTINGS_ACTIVE_PLUGINS			"active-plugins"
 
diff --git a/src/gtr-tab.ui b/src/gtr-tab.ui
index 2f978805f57ecf228fe164844a43722480680978..b5e785729262616a7a877cce1abe1317e6ea6165 100644
--- a/src/gtr-tab.ui
+++ b/src/gtr-tab.ui
@@ -29,7 +29,6 @@
             <child>
               <object class="GtrMessageTable" id="message_table">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="tab">GtrTab</property>
                 <property name="height_request">350</property>
                 <property name="width_request">450</property>
@@ -83,7 +82,6 @@
                     <child>
                       <object class="GtkScrolledWindow" id="text_msgid_scroll">
                         <property name="vexpand">1</property>
-                        <property name="focusable">1</property>
                         <property name="has_frame">1</property>
                         <child>
                           <object class="GtrView" id="text_msgid">
@@ -95,7 +93,6 @@
                     <child>
                       <object class="GtkScrolledWindow" id="text_plural_scroll">
                         <property name="vexpand">1</property>
-                        <property name="focusable">1</property>
                         <property name="has_frame">1</property>
                         <child>
                           <object class="GtrView" id="text_msgid_plural">
@@ -121,7 +118,6 @@
                 <child>
                   <object class="GtkNotebook" id="trans_notebook">
                     <property name="vexpand">1</property>
-                    <property name="focusable">1</property>
                     <property name="show_border">0</property>
                   </object>
                 </child>
@@ -269,17 +265,13 @@
       <attribute name='label' translatable='yes'>Keyboard Shortcuts</attribute>
       <attribute name='action'>win.show-help-overlay</attribute>
     </item>
-    <item>
-      <attribute name='label' translatable='yes'>About Translation Editor</attribute>
-      <attribute name='action'>app.about</attribute>
-    </item>
     <item>
       <attribute name='label' translatable='yes'>Help</attribute>
       <attribute name='action'>app.help</attribute>
     </item>
     <item>
-      <attribute name='label' translatable='yes'>Quit</attribute>
-      <attribute name='action'>app.quit</attribute>
+      <attribute name='label' translatable='yes'>About Translation Editor</attribute>
+      <attribute name='action'>app.about</attribute>
     </item>
   </section>
   </menu>
@@ -291,7 +283,6 @@
       <object class="GtkBox">
         <child>
           <object class="GtkButton" id="open_button">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Open a new file (&lt;Ctrl&gt;o)</property>
             <property name="action_name">app.open</property>
@@ -317,7 +308,6 @@
       <object class="GtkBox">
         <child>
           <object class="GtkButton" id="undo">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Undo (&lt;Ctrl&gt;z)</property>
             <property name="action_name">app.undo</property>
@@ -326,7 +316,6 @@
         </child>
         <child>
           <object class="GtkButton" id="redo">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Redo (&lt;Ctrl&gt;&lt;Shift&gt;z)</property>
             <property name="action_name">app.redo</property>
@@ -345,7 +334,6 @@
       <object class="GtkBox">
         <child>
           <object class="GtkButton" id="prev_untranslated">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Previous message without translation (&lt;Alt&gt;&lt;Page Up&gt;)</property>
             <property name="action_name">app.prev_no</property>
@@ -354,7 +342,6 @@
         </child>
         <child>
           <object class="GtkButton" id="next_untranslated">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Next message without translation (&lt;Alt&gt;&lt;Page Down&gt;)</property>
             <property name="action_name">app.next_no</property>
@@ -379,23 +366,15 @@
     </child>
     <child>
       <object class="GtkMenuButton" id="sortby_menu">
-        <property name="focusable">1</property>
         <property name="receives_default">1</property>
         <property name="popover">order_menu_popover</property>
         <property name="tooltip_text" translatable="1">Sort messages by</property>
         <property name="icon_name">view-sort-ascending-symbolic</property>
-
-          <!-- TODO: To be replace in gtk4
-          <child internal-child="accessible">
-          <object class="AtkObject" id="sortby_menu-atkobject">
-            <property name="AtkObject::accessible-name" translatable="1">Order by menu</property>
-          </object>
-        </child>-->
+        <property name="primary">True</property>
       </object>
     </child>
     <child type="end">
       <object class="GtkMenuButton" id="main_menu">
-        <property name="focusable">1</property>
         <property name="receives_default">1</property>
         <property name="popover">main_menu_popover</property>
         <property name="icon_name">open-menu-symbolic</property>
@@ -409,7 +388,6 @@
     </child>
     <child type="end">
       <object class="GtkToggleButton" id="search_toggle">
-        <property name="focusable">1</property>
         <property name="receives_default">1</property>
         <property name="tooltip_text" translatable="1">Find (&lt;Ctrl&gt;&lt;f&gt;)</property>
         <property name="action_name">app.findtoggle</property>
@@ -427,7 +405,6 @@
         <child>
           <object class="GtkButton" id="save">
             <property name="label" translatable="1">Save</property>
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Save the current file (&lt;Ctrl&gt;s)</property>
             <property name="action_name">app.save</property>
@@ -435,7 +412,6 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Save as (&lt;Ctrl&gt;&lt;Shift&gt;s)</property>
             <property name="action_name">app.saveas</property>
@@ -444,7 +420,6 @@
         </child>
         <child>
           <object class="GtkButton" id="upload">
-            <property name="focusable">1</property>
             <property name="receives_default">1</property>
             <property name="tooltip_text" translatable="1">Upload file (&lt;Ctrl&gt;b)</property>
             <property name="action_name">app.upload_file</property>
diff --git a/src/gtr-view.c b/src/gtr-view.c
index 390af2473728d631b1bd192d8b3d1f189ce3245b..a79575983a74ce85f834aa2a2ecc2680e56fd372 100644
--- a/src/gtr-view.c
+++ b/src/gtr-view.c
@@ -56,6 +56,12 @@ typedef struct
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtrView, gtr_view, GTK_SOURCE_TYPE_VIEW)
 
+static void
+notify_dark_cb (GtrView *view)
+{
+  gtr_view_reload_scheme_color (view);
+}
+
 static void
 gtr_view_init (GtrView * view)
 {
@@ -66,6 +72,7 @@ gtr_view_init (GtrView * view)
   const gchar *const *temp;
   gchar *ui_dir;
   GtrViewPrivate *priv;
+  AdwStyleManager *manager;
 
   g_autofree char *font = NULL;
 
@@ -117,6 +124,9 @@ gtr_view_init (GtrView * view)
 
   /* Set scheme color according to preferences */
   gtr_view_reload_scheme_color (view);
+  manager = adw_style_manager_get_default ();
+  g_signal_connect_swapped (manager, "notify::dark",
+                            G_CALLBACK (notify_dark_cb), view);
   gtk_text_view_set_monospace (GTK_TEXT_VIEW (view), TRUE);
 }
 
@@ -758,18 +768,19 @@ gtr_view_reload_scheme_color (GtrView * view)
   GtkSourceBuffer *buf;
   GtkSourceStyleScheme *scheme;
   GtkSourceStyleSchemeManager *manager;
-  GtrViewPrivate *priv;
-  gchar *scheme_id;
-
-  priv = gtr_view_get_instance_private (view);
+  const gchar *scheme_id;
+  AdwStyleManager *style_manager;
 
+  style_manager = adw_style_manager_get_default ();
   buf = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
   manager = gtk_source_style_scheme_manager_get_default ();
 
-  scheme_id = g_settings_get_string (priv->ui_settings,
-                                     GTR_SETTINGS_COLOR_SCHEME);
+  if (adw_style_manager_get_dark (style_manager))
+    scheme_id = "Adwaita-dark";
+  else
+    scheme_id = "Adwaita";
+
   scheme = gtk_source_style_scheme_manager_get_scheme (manager, scheme_id);
-  g_free (scheme_id);
 
   gtk_source_buffer_set_style_scheme (buf, scheme);
 }
diff --git a/src/gtr-window.c b/src/gtr-window.c
index 7ab3e38943cf18b468b65691a85dcece2a573721..dd173718a4f12c1f62fbc8fb09ef8a835f8f390c 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -248,6 +248,10 @@ gtr_window_init (GtrWindow *window)
   priv->state_settings = g_settings_new ("org.gnome.gtranslator.state.window");
   priv->active_tab = NULL;
 
+  /* loading custom styles */
+  if (g_strrstr (PACKAGE_APPID, "Devel") != NULL)
+    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
+
   gtk_widget_init_template (GTK_WIDGET (window));
 
   /* Profile manager */
@@ -645,8 +649,6 @@ gtr_window_show_tm_dialog (GtrWindow *window)
   dlg = gtr_translation_memory_dialog_new (GTK_WINDOW (window),
                                            priv->translation_memory);
 
-  g_signal_connect (dlg, "response", G_CALLBACK (gtk_window_destroy), NULL);
-
   gtk_window_present (GTK_WINDOW (dlg));
 }
 
diff --git a/src/translation-memory/gtr-translation-memory-dialog.ui b/src/translation-memory/gtr-translation-memory-dialog.ui
index ab5ff721bb7ec4a546ae295756fada590250c50a..fda8ea98c90bc7386803fbe66340045c66d33b6d 100644
--- a/src/translation-memory/gtr-translation-memory-dialog.ui
+++ b/src/translation-memory/gtr-translation-memory-dialog.ui
@@ -19,7 +19,6 @@
       <object class="GtkOverlay" id="overlay">
         <child type="overlay">
           <object class="GtkProgressBar" id="add_database_progressbar">
-            <property name="can_focus">False</property>
             <property name="visible">False</property>
             <style>
               <class name="osd"/>
@@ -60,7 +59,7 @@
                         <property name="subtitle" translatable="no"></property>
                         <property name="activatable-widget">use_lang_profile_in_tm</property>
                         <child type="prefix">
-                          <object class="GtkCheckButton" id="use_lang_profile_in_tm">
+                          <object class="GtkSwitch" id="use_lang_profile_in_tm">
                             <property name="valign">center</property>
                           </object>
                         </child>
@@ -77,10 +76,11 @@
                   <object class="GtkButton" id="add_database_button">
                     <property name="label" translatable="yes">Add to Database</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
                     <style>
                       <class name="suggested-action"/>
+                      <class name="pill"/>
                     </style>
                   </object>
                 </child>