diff --git a/po/fr.po b/po/fr.po
index 46c970ba..c1d66621 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,16 +7,17 @@
 # Gnome Terminator <terminator@lazyfrosch.de>, 2020
 # Samuël Weber/GwendalD <samuel.weber@normalesup.org>, 2020
 # fred lulu, 2022
+# Valentin Rieu, 2025
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-19 09:28-0400\n"
+"POT-Creation-Date: 2022-10-19 09:29-0400\n"
 "PO-Revision-Date: 2020-04-22 08:11+0000\n"
-"Last-Translator: fred lulu, 2022\n"
-"Language-Team: French (https://www.transifex.com/terminator/teams/109338/fr/)\n"
+"Last-Translator: Valentin Rieu, 2025\n"
+"Language-Team: French (https://app.transifex.com/terminator/teams/109338/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1504,7 +1505,7 @@ msgstr "Fermer la barre de recherche"
 
 #: ../terminatorlib/terminal_popup_menu.py:58
 msgid "_Send email to..."
-msgstr "Envoyer un couuriel à..."
+msgstr "Envoyer un courriel à..."
 
 #: ../terminatorlib/terminal_popup_menu.py:59
 msgid "_Copy email address"
diff --git a/po/hu.po b/po/hu.po
index 23aac914..7b2bcf11 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Gnome Terminator <terminator@lazyfrosch.de>, 2020
-# linuxrendszergazda linuxrendszergazda, 2024
+# linuxrendszergazda linuxrendszergazda, 2025
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-19 09:29-0400\n"
 "PO-Revision-Date: 2020-04-22 08:11+0000\n"
-"Last-Translator: linuxrendszergazda linuxrendszergazda, 2024\n"
+"Last-Translator: linuxrendszergazda linuxrendszergazda, 2025\n"
 "Language-Team: Hungarian (https://app.transifex.com/terminator/teams/109338/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,15 +41,15 @@ msgstr "Terminál kettéosztása függőlegesen"
 
 #: ../remotinator.py:43
 msgid "Get a list of all terminals"
-msgstr "Adj egy listát az összes terminálról"
+msgstr "Kérek egy listát az összes terminálról"
 
 #: ../remotinator.py:44
 msgid "Get the uuid of the current focused terminal"
-msgstr "Az jelenleg fókuszált terminál uuid azonosítójának a lekérése"
+msgstr "Jelenleg fókuszban lévő terminál UUID azonosítójának a lekérése"
 
 #: ../remotinator.py:45
 msgid "Get the UUID of a parent window"
-msgstr "A szülőablak uuid azonosító mutatása"
+msgstr "Szülőablak UUID azonosítójának a mutatása"
 
 #: ../remotinator.py:46
 msgid "Get the title of a parent window"
@@ -81,7 +81,7 @@ msgstr "Aktuális terminál-profil váltása"
 
 #: ../remotinator.py:53
 msgid "Switch profile of all currently running terminals"
-msgstr "Az jelenleg futó összes terminál profiljának a váltása"
+msgstr "Jelenleg futó összes terminál profiljának a váltása"
 
 #: ../remotinator.py:70
 #, python-format
@@ -272,7 +272,7 @@ msgstr "Lap bezárása"
 
 #: ../terminatorlib/optionparse.py:43
 msgid "Display program version"
-msgstr "A program verziójának megjelenítése"
+msgstr "Program verziójának megjelenítése"
 
 #: ../terminatorlib/optionparse.py:45 ../terminatorlib/optionparse.py:47
 msgid "Maximize the window"
@@ -320,7 +320,7 @@ msgstr "Részben konfigurációs json fájl megadása"
 
 #: ../terminatorlib/optionparse.py:76
 msgid "Set the working directory"
-msgstr "A munkakönyvtár beállítása"
+msgstr "Munkakönyvtár beállítása"
 
 #: ../terminatorlib/optionparse.py:77
 msgid "Set a custom icon for the window (by file or name)"
@@ -368,15 +368,15 @@ msgstr "Ha már fut a Terminátor, akkor csak új fület nyisson"
 #: ../terminatorlib/optionparse.py:98
 msgid "If Terminator is already running, just unhide all hidden windows"
 msgstr ""
-"Ha a terminátor már fut, akkor jelenítse meg csak az összes rejtett ablakot"
+"Ha a Terminátor már fut, akkor csak jelenjen meg az összes rejtett ablak"
 
 #: ../terminatorlib/optionparse.py:100
 msgid "List all profiles"
-msgstr "Az összes profil megjelenítése"
+msgstr "Összes profil megjelenítése"
 
 #: ../terminatorlib/optionparse.py:102
 msgid "List all layouts"
-msgstr "Az összes elrendezés megjelenítése"
+msgstr "Összes elrendezés megjelenítése"
 
 #: ../terminatorlib/plugins/activitywatch.py:54
 msgid "Watch for _activity"
@@ -408,7 +408,7 @@ msgstr "_Beállítások"
 
 #: ../terminatorlib/plugins/custom_commands.py:134
 msgid "Custom Commands Configuration"
-msgstr "Egyéni parancsok konfigurációja"
+msgstr "Egyéni parancsok beállítása"
 
 #: ../terminatorlib/plugins/custom_commands.py:138
 #: ../terminatorlib/plugins/custom_commands.py:287
@@ -494,7 +494,7 @@ msgstr "A *%s* név már foglalt."
 
 #: ../terminatorlib/plugins/dir_open.py:26
 msgid "Open current directory"
-msgstr "A jelenlegi könyvtár megnyitása"
+msgstr "Jelenlegi könyvtár megnyitása"
 
 #: ../terminatorlib/plugins/logger.py:21
 #: ../terminatorlib/plugins/terminalshot.py:21
@@ -560,7 +560,7 @@ msgstr "Parancs újbóli futtatása"
 
 #: ../terminatorlib/preferences.glade.h:10
 msgid "Hold the terminal open"
-msgstr "A terminál nyitva hagyása"
+msgstr "Tartsa nyitva a terminált"
 
 #: ../terminatorlib/preferences.glade.h:11
 msgid "Black on light yellow"
@@ -632,7 +632,7 @@ msgstr "Kattintás a fókuszhoz"
 
 #: ../terminatorlib/preferences.glade.h:28
 msgid "Follow mouse pointer"
-msgstr "Az egérmutató követése"
+msgstr "Egérmutató követése"
 
 #: ../terminatorlib/preferences.glade.h:29
 msgid "Tango"
@@ -785,7 +785,7 @@ msgstr "<b>Megjelenés</b>"
 
 #: ../terminatorlib/preferences.glade.h:67
 msgid "Window borders"
-msgstr "Ablak keretek"
+msgstr "Ablakkeretek"
 
 #: ../terminatorlib/preferences.glade.h:68
 msgid "Unfocused terminal font brightness:"
@@ -893,7 +893,7 @@ msgstr "<b>Terminál csengő</b>"
 
 #: ../terminatorlib/preferences.glade.h:94
 msgid "Titlebar icon"
-msgstr "Címsorbeli ikon"
+msgstr "Címsor ikonja"
 
 #: ../terminatorlib/preferences.glade.h:95
 msgid "Visual flash"
@@ -901,11 +901,11 @@ msgstr "Látható villanás"
 
 #: ../terminatorlib/preferences.glade.h:96
 msgid "Audible beep"
-msgstr "Hangalapú hangjelzés"
+msgstr "Hallható sípolás"
 
 #: ../terminatorlib/preferences.glade.h:97
 msgid "Window list flash"
-msgstr "Ablak listája villog"
+msgstr "Ablaklista villogás"
 
 #: ../terminatorlib/preferences.glade.h:98
 msgid "General"
diff --git a/terminatorlib/plugins/auto_theme.py b/terminatorlib/plugins/auto_theme.py
new file mode 100644
index 00000000..43ea527b
--- /dev/null
+++ b/terminatorlib/plugins/auto_theme.py
@@ -0,0 +1,461 @@
+
+'''
+Terminator plugin to implement AutoTheme:
+  Let profile follow system Dark/Light mode (when system theme change).
+
+ Author: yurenchen@yeah.net
+License: GPLv2
+   Site: https://github.com/yurenchen000/terminator-autotheme-plugin
+'''
+
+# import os
+from gi.repository import Gtk
+from gi.repository import Gdk
+import terminatorlib.plugin as plugin
+from terminatorlib.config import Config
+from terminatorlib.translation import _
+
+from terminatorlib.util import dbg
+from terminatorlib.terminal import Terminal
+from terminatorlib.terminator import Terminator
+
+import gi
+try:
+    gi.require_version('Handy', '1')
+    from gi.repository import Handy
+    AVAILABLE = ['AutoTheme']
+except (ImportError, ValueError):
+    err('Auto Theme plugin unavailable as we cannot import libhandy')
+
+# Every plugin you want Terminator to load *must* be listed in 'AVAILABLE'
+
+## disable log
+# print = lambda *a:None
+
+"""Terminator Plugin AutoTheme"""
+class AutoTheme(plugin.MenuItem):
+    """Add custom commands to the terminal menu"""
+    capabilities = ['terminal_menu']
+
+    light = ''
+    dark = ''
+    mode = ''
+    variant = ''
+    list = []
+    change_cb = None
+
+    conn_handle = None
+
+    def __init__(self):
+        plugin.MenuItem.__init__(self)
+        self.__class__.load_config()
+        self.setup_theme_monitor()
+
+    ## on menu_show
+    def callback(self, menuitems, menu, terminal):
+        item = Gtk.CheckMenuItem(_(' -  AutoTheme'))
+        # item.set_active(True)
+        item.connect("toggled", self.do_menu_toggle, terminal)
+        menuitems.append(item)
+        # print('AutoTheme __init__..')
+
+        # AutoTheme.load_config()
+        ## load mode stat
+        mode = AutoTheme.mode=='Dark' or AutoTheme.mode=='Auto' and AutoTheme.is_dark_theme()
+        print('load mode:', mode)
+        AutoTheme.change_theme(mode)
+
+        ## load variant stat
+        self.teardown_theme_monitor()  ## don't mess up with terminal profile
+        style_manager = Handy.StyleManager.get_default()
+        style_manager.set_color_scheme(AutoTheme.to_variant(AutoTheme.variant))
+        self.setup_theme_monitor()
+
+    @staticmethod
+    def setup_theme_monitor():
+        print('++ setup_theme_monit')
+        settings = Gtk.Settings.get_default()
+        # theme_name = settings.get_property('gtk-theme-name')
+        # theme_variant = settings.get_property('gtk-application-prefer-dark-theme')
+        # print('--theme_name:', theme_name, theme_variant)
+
+        ## TODO: can't distinguish dark_theme/prefer_dark OR theme_variant
+        def _on_theme_name_changed(settings, gparam):
+            print('--_on_theme_name_changed:', settings, gparam)
+            theme_name = settings.get_property('gtk-theme-name')
+            theme_variant = settings.get_property('gtk-application-prefer-dark-theme')
+            print('== on_theme_name change:', theme_name, theme_variant)
+            if  AutoTheme.mode != 'Auto':
+                print('vte mode: not auto, not auto change:', AutoTheme.mode)
+                return
+
+            # is_dark = 'dark' in theme_name
+            is_dark = 'dark' in theme_name or theme_variant  ## set_color_scheme affect this
+            AutoTheme.change_theme(is_dark)
+            if callable(AutoTheme.change_cb):
+                AutoTheme.change_cb(is_dark)
+
+        if not AutoTheme.conn_handle:
+            AutoTheme.conn_handle = Gtk.Settings.get_default().connect("notify::gtk-theme-name", _on_theme_name_changed)
+
+    @staticmethod
+    def teardown_theme_monitor():
+        if AutoTheme.conn_handle:
+            print('-- teardown_theme_monit')
+            Gtk.Settings.get_default().disconnect(AutoTheme.conn_handle)
+            AutoTheme.conn_handle = None
+
+    @staticmethod
+    def is_dark_theme():
+        settings = Gtk.Settings.get_default()
+        theme_name = settings.get_property('gtk-theme-name')
+        theme_variant = settings.get_property('gtk-application-prefer-dark-theme')
+        print('--theme_name:', theme_name, theme_variant)
+        # is_dark = 'dark' in theme_name
+        is_dark = 'dark' in theme_name or theme_variant  ## set_color_scheme affect this
+        return is_dark
+
+    @staticmethod
+    def apply_theme(name):
+        terminator = plugin.Terminator()
+        # print('---terminals:', len(ts), ts)
+        for term in terminator.terminals:
+            # print('term:', term)
+            term.set_profile(term.get_vte(), name)
+
+    @staticmethod
+    def change_theme(isdark):
+        # theme = '_light2' if isdark else '_light_day'
+        theme = AutoTheme.dark if isdark else AutoTheme.light
+        print('--change_theme:', isdark, theme)
+        AutoTheme.apply_theme(theme)
+
+
+    @classmethod
+    def to_variant(cls, scheme):
+        if scheme == 'light':  ## will mess up on_theme_change values
+            return Handy.ColorScheme.FORCE_LIGHT
+        elif scheme == 'dark':
+            return Handy.ColorScheme.FORCE_DARK
+        else:  ## system
+            return Handy.ColorScheme.PREFER_LIGHT
+
+    @classmethod
+    def save_config(cls, light, dark, mode, variant):
+        print('=== save_config:', light, dark, mode, variant)
+        cls.light = light
+        cls.dark  = dark
+        cls.mode  = mode
+        cls.variant = variant
+        cfg = {'light': light, 'dark': dark, 'mode': mode, 'variant': variant}
+        config = Config()
+        config.plugin_set_config(cls.__name__, cfg)
+        config.save()
+
+    @classmethod
+    def load_config(cls):
+        cur_profile = plugin.Terminator().terminals[0].get_profile()
+        cfg = Config().plugin_get_config(cls.__name__) or {}
+        print('--- load_config:', cfg)
+        cls.light = cfg.get('light', cur_profile)
+        cls.dark  = cfg.get('dark',  cur_profile)
+        cls.mode  = cfg.get('mode', 'Auto')
+        cls.variant = cfg.get('variant', 'auto')
+        print('=== load_config:', cls.light, cls.dark, cls.mode, cls.variant)
+
+    @classmethod
+    def do_menu_toggle(cls, _widget, terminal):
+        terminator = plugin.Terminator()
+        cls.list = terminator.config.list_profiles()
+        print('profiles:', cls.list)
+        cls.load_config()
+
+        dialog = MySettingDialog(None, cls)
+        # dialog.set_list(cls.list)
+        # dialog.set_list_sel(cls.light, cls.dark)
+        # dialog.set_mode_sel(cls.mode)
+
+        response = dialog.run()
+        if response == Gtk.ResponseType.OK:
+            cls.save_config(dialog.light_sel, dialog.dark_sel, dialog.mode_sel, dialog.variant_sel)
+
+        dialog.destroy()
+
+
+class MySettingDialog(Gtk.Dialog):
+    def __init__(self, parent, mgr):
+        super().__init__(title="Auto Theme Settings", parent=parent, flags=0)
+
+        self.light_sel = ''
+        self.dark_sel = ''
+        self.mode_sel = mgr.mode
+        self.variant_sel = mgr.variant
+        self.list = []
+        self.mgr = mgr
+
+        box = self.get_content_area()
+        self.box = box
+
+        ## --------- Create grid layout
+        grid = Gtk.Grid()
+        box.add(grid)
+
+        # Set column and row spacing
+        grid.set_row_spacing(10)
+        grid.set_column_spacing(10)
+
+        # Add padding to the grid
+        grid.set_margin_top(20)
+        grid.set_margin_bottom(5)
+        grid.set_margin_start(20) # left
+        grid.set_margin_end(20)   # right
+
+        # Set default dialog size
+        self.set_default_size(400, 300)
+
+
+        ## --------- col0: plain label
+        light_label = Gtk.Label(label="Light")
+        dark_label  = Gtk.Label(label="Dark")
+        grid.attach(dark_label,  0, 1, 1, 1)
+        grid.attach(light_label, 0, 0, 1, 1)
+
+        light_label.set_name('light_label')
+        dark_label.set_name('dark_label')
+        # self.light_label = light_label
+        # self.dark_label  = dark_label
+
+        ## --------- col1: profile combo
+        # Light combo box
+        self.light_combo = Gtk.ComboBoxText()
+        self.light_combo.append_text("Option 1")
+        self.light_combo.append_text("Option 2")
+        self.light_combo.append_text("Option 3")
+
+        # Dark combo box
+        self.dark_combo = Gtk.ComboBoxText()
+        self.dark_combo.append_text("Option 1")
+        self.dark_combo.append_text("Option 2")
+        self.dark_combo.append_text("Option 3")
+
+        grid.attach(self.light_combo,  1, 0, 1, 1)
+        grid.attach(self.dark_combo,   1, 1, 1, 1)
+        grid.get_child_at(1, 0).set_hexpand(True)
+        grid.get_child_at(1, 1).set_hexpand(True)
+        # print('--grid.get_child:', grid.get_child_at(1, 0) == self.light_combo)
+
+        ### --------- row2: space
+        space_label = Gtk.Label(label="")
+        grid.attach(space_label, 1, 2, 1, 1)
+
+        ### --------- row3: mode radio
+        self.radio_light = Gtk.RadioButton.new_with_label_from_widget(None, "Light")
+        self.radio_dark  = Gtk.RadioButton.new_with_label_from_widget(self.radio_light, "Dark")
+        self.radio_auto  = Gtk.RadioButton.new_with_label_from_widget(self.radio_light, "Auto")
+
+        self.radio_auto.set_tooltip_text('Follow System Theme\n   -   Need Gtk: Auto')
+        self.radio_light.set_mode(False)
+        self.radio_dark.set_mode(False)
+        self.radio_auto.set_mode(False)
+
+        # button_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
+        button_box = Gtk.ButtonBox.new(Gtk.Orientation.HORIZONTAL)
+        # button_box.set_layout(Gtk.ButtonBoxStyle.START)
+        button_box.set_layout(Gtk.ButtonBoxStyle.EXPAND)
+        # button_box.set_spacing(5)
+
+        # Pack buttons into the button box
+        button_box.pack_start(self.radio_light, True, True, 0)
+        button_box.pack_start(self.radio_dark,  True, True, 0)
+        button_box.pack_start(self.radio_auto,  True, True, 0)
+
+        # Attach the button box to the grid
+        mode_label = Gtk.Label(label="Vte")
+        mode_label.set_tooltip_text('for terminal')
+        grid.attach(mode_label, 0, 3, 1, 1)
+        grid.attach(button_box, 1, 3, 1, 1)
+
+
+        ### --------- row4: theme variant
+        #### ---- use radio
+        self.variant_light = Gtk.RadioButton.new_with_label_from_widget(None, "Light")
+        self.variant_dark  = Gtk.RadioButton.new_with_label_from_widget(self.variant_light, "Dark")
+        self.variant_auto  = Gtk.RadioButton.new_with_label_from_widget(self.variant_light, "Auto")
+
+        self.variant_auto.set_tooltip_text('Follow System Theme')
+        self.variant_light.set_mode(False)
+        self.variant_dark.set_mode(False)
+        self.variant_auto.set_mode(False)
+        self.variant_auto.set_active(True)
+
+        # style_manager = Handy.StyleManager.get_default()
+        # style_manager.set_color_scheme(mgr.to_variant(self.variant_sel))
+        # style_manager.set_color_scheme(Handy.ColorScheme.PREFER_LIGHT)
+        button_box2 = Gtk.ButtonBox.new(Gtk.Orientation.HORIZONTAL)
+        # button_box2.set_layout(Gtk.ButtonBoxStyle.START)
+        button_box2.set_layout(Gtk.ButtonBoxStyle.EXPAND)
+        # button_box2.set_spacing(5)
+
+        # Pack buttons into the button box
+        button_box2.pack_start(self.variant_light, True, True, 0)
+        button_box2.pack_start(self.variant_dark,  True, True, 0)
+        button_box2.pack_start(self.variant_auto,  True, True, 0)
+
+        theme_label = Gtk.Label(label="Gtk")
+        theme_label.set_tooltip_text('for UI')
+        grid.attach(button_box2, 1, 4, 1, 1)
+        grid.attach(theme_label, 0, 4, 1, 1)
+
+
+
+        ### --------- init values
+        self.set_list(mgr.list)
+        self.set_list_sel(mgr.light, mgr.dark)
+        self.set_mode_sel(mgr.mode)
+        self.set_variant_sel(mgr.variant)
+
+        mgr.change_cb = self.change_cb
+
+        ### --------- variant onchange
+        self.variant_light.connect("toggled", self.on_variant_button_toggled)
+        self.variant_dark.connect( "toggled", self.on_variant_button_toggled)
+        self.variant_auto.connect( "toggled", self.on_variant_button_toggled)
+
+        ### --------- combox onchange
+        self.light_combo.connect('changed', self.on_light_combo_change)
+        self.dark_combo.connect('changed',  self.on_dark_combo_change)
+
+        ### --------- readio onchange
+        self.radio_light.connect("toggled", self.on_radio_button_toggled)
+        self.radio_dark.connect("toggled",  self.on_radio_button_toggled)
+        self.radio_auto.connect("toggled",  self.on_radio_button_toggled)
+
+        ### --------- footer: action buttons
+        self.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
+        self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK)
+
+        # Connect the response signal
+        self.connect("response", self.on_dialog_response)
+
+        # grid.set_row_spacing(15)
+        self.add_css()
+        self.show_all()
+
+    def set_list(self, list1):
+         self.light_combo.remove_all()
+         self.dark_combo.remove_all()
+         self.list = list1
+         for name in list1:
+            self.light_combo.append_text(name)
+            self.dark_combo.append_text(name)
+
+    def set_list_sel(self, val1, val2):
+        if val1 in self.list:
+            self.light_combo.set_active(self.list.index(val1))
+        if val2 in self.list:
+            self.dark_combo.set_active(self.list.index(val2))
+
+    def set_mode_sel(self, val1):
+        self.box.set_name(val1) # css active
+        if val1 == 'Auto':
+            self.radio_auto.set_active(True)
+            theme_mode = 'Dark' if self.mgr.is_dark_theme() else 'Light'
+            self.box.set_name(theme_mode) # css active
+        elif val1 == 'Light':
+            self.radio_light.set_active(True)
+        else:
+            self.radio_dark.set_active(True)
+            # self.radio_dark.active = True
+
+    def set_variant_sel(self, scheme):
+        if scheme == 'light':
+            self.variant_light.set_active(True)
+        elif scheme == 'dark':
+            self.variant_dark.set_active(True)
+        else:
+            self.variant_auto.set_active(True)
+
+    def add_css(self):
+        css = b"""
+        #dark_label, #light_label {
+            padding: 0px 15px;
+        }
+        #Dark  #dark_label,
+        #Light #light_label {
+            /* background-color: green; */
+            background-color: rgba(0, 255, 0, 0.2);
+            /* color: green; */
+            border-radius: 8px;
+            padding: 0px 15px;
+            /* border-bottom: 1px solid green; */
+            /* text-decoration: underline; */
+        }
+        """
+        css_provider = Gtk.CssProvider()
+        css_provider.load_from_data(css)
+        context = Gtk.StyleContext()
+        screen = Gdk.Screen.get_default()
+        context.add_provider_for_screen(screen, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+    def on_light_combo_change(self, widget):
+        theme = widget.get_active_text()
+        print('-- light selected:', theme)
+        self.mgr.apply_theme(theme)
+    def on_dark_combo_change(self, widget):
+        theme = widget.get_active_text()
+        print('-- dark selected:', theme)
+        self.mgr.apply_theme(theme)
+
+    def change_cb(self, is_dark):
+        print('-- change_cb:', is_dark)
+        theme_mode = 'Dark' if is_dark else 'Light'
+        self.box.set_name(theme_mode) # css active
+
+    def on_radio_button_toggled(self, widget):
+        if widget.get_active():
+            print('-- mode selected:', widget.get_label())
+            # unsel = 'Light' if self.mode_sel=='Dark' else 'Dark'
+            self.mode_sel = widget.get_label()
+            self.box.set_name(self.mode_sel) # css active
+
+            theme_mode = self.mode_sel
+            if self.mode_sel == 'Auto':
+                theme_mode = 'Dark' if self.mgr.is_dark_theme() else 'Light'
+                self.box.set_name(theme_mode) # css active
+
+            theme_name = self.dark_combo.get_active_text() if theme_mode == 'Dark' else self.light_combo.get_active_text()
+            self.mgr.mode = self.mode_sel  ## TODO: just teardown_theme_monitor
+            # print('--cls:', self.mgr, AutoTheme, self.mgr == AutoTheme, AutoTheme.mode)
+            self.mgr.apply_theme(theme_name)
+
+    ## NOTE: set_color_scheme will change notify::gtk-theme-name event behivor
+    def on_variant_button_toggled(self, widget):
+        if not widget.get_active():
+            return
+        scheme = widget.get_label().lower()
+        style_manager = Handy.StyleManager.get_default()
+        self.variant_sel = scheme
+
+        print('--on_variant_change:', scheme)
+        self.mgr.teardown_theme_monitor()  ## don't mess up with terminal profile
+
+        if scheme == 'light':  ## will mess up on_theme_change values
+            style_manager.set_color_scheme(Handy.ColorScheme.FORCE_LIGHT)
+        elif scheme == 'dark':
+            style_manager.set_color_scheme(Handy.ColorScheme.FORCE_DARK)
+        else:  ## system
+            style_manager.set_color_scheme(Handy.ColorScheme.PREFER_LIGHT)
+
+        self.mgr.setup_theme_monitor()
+
+    def on_dialog_response(self, dialog, response_id):
+        # print('== on response:', response_id)
+        self.mgr.change_cb = None
+        self.light_sel = self.light_combo.get_active_text()
+        self.dark_sel  = self.dark_combo.get_active_text()
+        if response_id == Gtk.ResponseType.OK:
+            pass
+        # elif response_id == Gtk.ResponseType.CANCEL:
+        else:
+            print("-- Cancel/close clicked.")
+
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index d0a15b4e..9166d35a 100644
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -916,6 +916,15 @@ def navigate_terminal(self, terminal, direction):
 
             # Get the coordinate of the appropriate edge for this direction
             edge, p1, p2 = util.get_edge(allocation, direction)
+            cols, rows = self.get_size()
+            if ((direction == 'down' and edge >= rows) or
+                (direction == 'right' and edge >= cols)):
+                edge =  0
+            elif (direction == 'up' and edge == 0):
+                edge = rows
+            elif (direction == 'left' and edge == 0):
+                edge = cols
+
             # Find all visible terminals which are, in their entirety, in the
             # direction we want to move, and are at least partially spanning
             # p1 to p2