diff --git a/home/themes/default.nix b/home/themes/default.nix
index 0ee7404..3ea1897 100644
--- a/home/themes/default.nix
+++ b/home/themes/default.nix
@@ -10,15 +10,17 @@ let
   };
 in
 {
-  options.my.theme = mkOption {
+  options.my.home = {
+    theme = mkOption {
       type = themeType;
+    };
+
+    themes = mkOption {
+      type = with types; attrsOf themeType;
+    };
   };
 
-  options.my.themes = mkOption {
-    type = with types; attrsOf themeType;
-  };
-
-  config.my.themes = {
+  config.my.home.themes = {
     solarizedLight = import ./solarizedLight;
   };
 }
diff --git a/home/x/i3.nix b/home/x/i3.nix
index 6ff8e37..ba0c559 100644
--- a/home/x/i3.nix
+++ b/home/x/i3.nix
@@ -14,7 +14,7 @@ let
 
   logoutMode = "[L]ogout, [S]uspend, [P]oweroff, [R]eboot";
 
-  i3Theme = config.my.theme.i3Theme;
+  i3Theme = config.my.home.theme.i3Theme;
 in
 {
   config = lib.mkIf isEnabled {
@@ -114,7 +114,6 @@ in
       # FIXME: integrate in config when it doesn't use deprecated new_window
       extraConfig = ''
         default_border pixel
-        workspace_auto_back_and_forth yes
       '';
     };
   };
diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix
index 722eb5f..d2290df 100644
--- a/hosts/boreal/home.nix
+++ b/hosts/boreal/home.nix
@@ -5,6 +5,6 @@
     my.home.x.enable = true;
     my.home.emacs.enable = true;
     my.home.tmux.enable = true;
-    my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
+    my.home.theme = config.home-manager.users.alarsyo.my.home.themes.solarizedLight;
   };
 }