diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix
index b03723d..6cc8107 100644
--- a/hosts/vali/mars/configuration.nix
+++ b/hosts/vali/mars/configuration.nix
@@ -90,7 +90,7 @@
               };
           };
           qt = {
-            enable = true;
+            enable = false;
             package = pkgs.catppuccin-kde;
             name = "Catppuccin-Mocha-Dark";
             variant = "mocha";
diff --git a/hosts/vali/mars/default.nix b/hosts/vali/mars/default.nix
index edd28ce..360094d 100644
--- a/hosts/vali/mars/default.nix
+++ b/hosts/vali/mars/default.nix
@@ -5,7 +5,5 @@ _: {
       ./hardware-configuration.nix
       ./profile.nix
       ./i3
-      ./awesome.nix
-      ./hypr/default.nix
     ];
 }
diff --git a/hosts/vali/mars/i3/default.nix b/hosts/vali/mars/i3/default.nix
index 2983f9e..f7480f7 100644
--- a/hosts/vali/mars/i3/default.nix
+++ b/hosts/vali/mars/i3/default.nix
@@ -1,5 +1,6 @@
 _: {
     imports = [
-        ./i3.nix
+    ./i3.nix
+    # ./i3-new.nix
     ];
 }
diff --git a/hosts/vali/mars/i3/i3-new.nix b/hosts/vali/mars/i3/i3-new.nix
new file mode 100644
index 0000000..a720230
--- /dev/null
+++ b/hosts/vali/mars/i3/i3-new.nix
@@ -0,0 +1,68 @@
+{pkgs, lib, config, ... }:
+with lib; let
+  cfg = config.myOptions.programs.i3;
+  username = config.myOptions.other.system.username;
+  mod = "Mod4";
+in {
+  options.myOptions.programs.i3.enable = mkEnableOption "i3";
+
+  config = mkIf cfg.enable {
+      services.xserver = {
+          enable = true;
+          xkb.layout =  "de";
+      };
+      xsession.windowManager.i3 = {
+          enable = true;
+          config = {
+              modifier = mod;
+              terminal = "alacritty";
+              fonts ={
+                 names = [ "JetBrains Mono" "pango:monospace"];
+                 size = 12;
+                 style = "Bold Semi-Condensed";
+                };
+              keybindings = lib.mkOptionDefault {
+                  # Run stuff
+                  "${mod}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
+                  "${mod}+Return" = "exec --no-startup-id alacritty";
+                  "${mod}+Shift+q" = "kill";
+                  # Focus
+                  "${mod}+h" = "focus left";
+                  "${mod}+j" = "focus down";
+                  "${mod}+k" = "focus up";
+                  "${mod}+l" = "focus right";
+                  # Move
+                  "${mod}+Shift+h" = "move left";
+                  "${mod}+Shift+j" = "move down";
+                  "${mod}+Shift+k" = "move up";
+                  "${mod}+Shift+l" = "move right";
+                  "XF86RaiseVolume" = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && $refresh_i3status";
+                  # Toggle stuff
+                  "${mod}+f" = "fullscreen toggle";
+              };
+              window = {
+                  titlebar = false;
+                  border = 3;
+                  hideEdgeBorders = true;
+              };
+              floating = {
+                  titlebar = false;
+              };
+              bars = [
+                  {
+                  position = "bottom";
+                  statusCommand = "${pkgs.i3status}/bin/i3status";
+                  }
+              ];
+              startup ={
+                  command = 
+                      "xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
+                      #"dex --autostart --environment i3";
+                      #"nm-applet";
+                      #"keepassxc";
+              };
+          };
+      };
+  };
+}
+
diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix
index 0aed28e..2afb568 100644
--- a/hosts/vali/mars/programs.nix
+++ b/hosts/vali/mars/programs.nix
@@ -6,7 +6,7 @@ in {
             alacritty
             alsa-utils
             asciinema
-            betterbird
+#            betterbird
             bibata-cursors
             dig
             easyeffects
@@ -57,6 +57,7 @@ in {
             spotube
             st
             steam
+            strawberry
             telegram-desktop
             texliveFull
             thunderbird
diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix
index a448f55..3509a3b 100644
--- a/modules/gui/qt.nix
+++ b/modules/gui/qt.nix
@@ -58,8 +58,8 @@ in {
                 sessionVariables = {
                     #QT_STYLE_OVERRIDE = "kvantum";
                     QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-                    QT_QPA_PLATFORM = "wayland;xcb";
-                    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+#                    QT_QPA_PLATFORM = "wayland;xcb";
+#                    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
                     DISABLE_QT_COMPAT = "0";
                 };
             };
diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix
index c20b7b4..8ce0370 100644
--- a/modules/other/xdg.nix
+++ b/modules/other/xdg.nix
@@ -5,8 +5,7 @@
     username = config.myOptions.other.system.username;
     hmCfg = config.home-manager.users.${username};
 
-    primary_browser = "firefox-schizo.desktop";
-    secondary_browser = "firefox-unschizo.desktop";
+    primary_browser = "schizofox.desktop";
     mail_client = "betterbird.desktop";
     file_manager = "pcmanfm.desktop";
     media_player = "mpv.desktop";
@@ -74,10 +73,10 @@ in {
                 enable = true;
                 defaultApplications = {
                     "text/html" = [ primary_browser secondary_browser ];
-                    "x-scheme-handler/http" = [ primary_browser secondary_browser ];
-                    "x-scheme-handler/https" = [ primary_browser secondary_browser ];
-                    "x-scheme-handler/about" = [ primary_browser secondary_browser ];
-                    "x-scheme-handler/unknown" = [ primary_browser secondary_browser ];
+                    "x-scheme-handler/http" = [ primary_browser ];
+                    "x-scheme-handler/https" = [ primary_browser ];
+                    "x-scheme-handler/about" = [ primary_browser ];
+                    "x-scheme-handler/unknown" = [ primary_browser ];
                     "x-scheme-handler/mailto" = [ mail_client ];
                     "message/rfc822" = [ mail_client ];
                     "x-scheme-handler/mid" = [ mail_client ];