diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
new file mode 100644
index 0000000..ef7f654
--- /dev/null
+++ b/gtk-4.0/gtk.css
@@ -0,0 +1,100 @@
+/*
+Generated with Gradience
+
+Issues caused by theming should be reported to Gradience repository, and not to upstream
+
+https://github.com/GradienceTeam/Gradience
+*/
+
+@define-color accent_color #a9b1d6;
+@define-color accent_bg_color #a9b1d6;
+@define-color accent_fg_color rgba(0, 0, 0, 0.87);
+@define-color destructive_color #F28B82;
+@define-color destructive_bg_color #F28B82;
+@define-color destructive_fg_color rgba(0, 0, 0, 0.87);
+@define-color success_color #81C995;
+@define-color success_bg_color #81C995;
+@define-color success_fg_color rgba(0, 0, 0, 0.87);
+@define-color warning_color #FDD633;
+@define-color warning_bg_color #FDD633;
+@define-color warning_fg_color rgba(0, 0, 0, 0.87);
+@define-color error_color #F28B82;
+@define-color error_bg_color #F28B82;
+@define-color error_fg_color rgba(0, 0, 0, 0.87);
+@define-color window_bg_color #1a1b26;
+@define-color window_fg_color #c0caf5;
+@define-color view_bg_color #1a1b26;
+@define-color view_fg_color #c0caf5;
+@define-color headerbar_bg_color #1a1b26;
+@define-color headerbar_fg_color #c0caf5;
+@define-color headerbar_border_color rgba(192, 202, 245, 0.12);
+@define-color headerbar_backdrop_color @window_bg_color;
+@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
+@define-color card_bg_color #1a1b26;
+@define-color card_fg_color #c0caf5;
+@define-color card_shade_color rgba(0, 0, 0, 0.36);
+@define-color dialog_bg_color #1a1b26;
+@define-color dialog_fg_color #c0caf5;
+@define-color popover_bg_color #1a1b26;
+@define-color popover_fg_color #c0caf5;
+@define-color shade_color rgba(0, 0, 0, 0.36);
+@define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
+@define-color sidebar_bg_color #1a1b26;
+@define-color sidebar_fg_color #c0caf5;
+@define-color secondary_sidebar_bg_color #1a1b26;
+@define-color secondary_sidebar_fg_color #c0caf5;
+@define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
+@define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
+@define-color thumbnail_bg_color #1a1b26;
+@define-color thumbnail_fg_color #c0caf5;
+@define-color sidebar_backdrop_color rgba(192, 202, 245, 0.12);
+@define-color secondary_sidebar_backdrop_color rgba(192, 202, 245, 0.12);
+@define-color blue_1 #99c1f1;
+@define-color blue_2 #62a0ea;
+@define-color blue_3 #3584e4;
+@define-color blue_4 #1c71d8;
+@define-color blue_5 #1a5fb4;
+@define-color green_1 #8ff0a4;
+@define-color green_2 #57e389;
+@define-color green_3 #33d17a;
+@define-color green_4 #2ec27e;
+@define-color green_5 #26a269;
+@define-color yellow_1 #f9f06b;
+@define-color yellow_2 #f8e45c;
+@define-color yellow_3 #f6d32d;
+@define-color yellow_4 #f5c211;
+@define-color yellow_5 #e5a50a;
+@define-color orange_1 #ffbe6f;
+@define-color orange_2 #ffa348;
+@define-color orange_3 #ff7800;
+@define-color orange_4 #e66100;
+@define-color orange_5 #c64600;
+@define-color red_1 #f66151;
+@define-color red_2 #ed333b;
+@define-color red_3 #e01b24;
+@define-color red_4 #c01c28;
+@define-color red_5 #a51d2d;
+@define-color purple_1 #dc8add;
+@define-color purple_2 #c061cb;
+@define-color purple_3 #9141ac;
+@define-color purple_4 #813d9c;
+@define-color purple_5 #613583;
+@define-color brown_1 #cdab8f;
+@define-color brown_2 #b5835a;
+@define-color brown_3 #986a44;
+@define-color brown_4 #865e3c;
+@define-color brown_5 #63452c;
+@define-color light_1 #ffffff;
+@define-color light_2 #f6f5f4;
+@define-color light_3 #deddda;
+@define-color light_4 #c0bfbc;
+@define-color light_5 #9a9996;
+@define-color dark_1 #77767b;
+@define-color dark_2 #5e5c64;
+@define-color dark_3 #3d3846;
+@define-color dark_4 #241f31;
+@define-color dark_5 #000000;
+
+.navigation-sidebar {
+background-color: #1a1b26;
+}
diff --git a/nix/base_packages.nix b/nix/base_packages.nix
index 60ca233..08124da 100644
--- a/nix/base_packages.nix
+++ b/nix/base_packages.nix
@@ -43,4 +43,11 @@
     nssmdns4 = true;
     openFirewall = true;
   };
+  services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
+    [org.gnome.desktop.interface]
+    gtk-theme='adw-gtk3'
+    cursor-theme='Bibata-Modern-Classsic'
+    cursor-size=24
+  '';
+
 }
diff --git a/nix/programs/common.nix b/nix/programs/common.nix
index 917a37f..b345195 100644
--- a/nix/programs/common.nix
+++ b/nix/programs/common.nix
@@ -50,6 +50,11 @@
 
   home.keyboard = null;
 
+  home.file.".local/share/flatpak/overrides/global".text = ''
+    [Context]
+    filesystems=xdg-config/gtk-3.0;xdg-config/gtk-4.0
+  '';
+
   programs.nix-index =
     {
       enable = true;
diff --git a/nix/programs/themes/gtk4.nix b/nix/programs/themes/gtk4.nix
index 996c4ab..5c5ba65 100644
--- a/nix/programs/themes/gtk4.nix
+++ b/nix/programs/themes/gtk4.nix
@@ -1,107 +1,109 @@
 {
-  xdg.configFile."gtk-4.0/gtk.css" = {
-    text =
-      ''
-        /*
-        Generated with Gradience
-
-        Issues caused by theming should be reported to Gradience repository, and not to upstream
-
-        https://github.com/GradienceTeam/Gradience
-        */
-
-        @define-color accent_color #a9b1d6;
-        @define-color accent_bg_color #a9b1d6;
-        @define-color accent_fg_color rgba(0, 0, 0, 0.87);
-        @define-color destructive_color #F28B82;
-        @define-color destructive_bg_color #F28B82;
-        @define-color destructive_fg_color rgba(0, 0, 0, 0.87);
-        @define-color success_color #81C995;
-        @define-color success_bg_color #81C995;
-        @define-color success_fg_color rgba(0, 0, 0, 0.87);
-        @define-color warning_color #FDD633;
-        @define-color warning_bg_color #FDD633;
-        @define-color warning_fg_color rgba(0, 0, 0, 0.87);
-        @define-color error_color #F28B82;
-        @define-color error_bg_color #F28B82;
-        @define-color error_fg_color rgba(0, 0, 0, 0.87);
-        @define-color window_bg_color #1a1b26;
-        @define-color window_fg_color #c0caf5;
-        @define-color view_bg_color #1a1b26;
-        @define-color view_fg_color #c0caf5;
-        @define-color headerbar_bg_color #1a1b26;
-        @define-color headerbar_fg_color #c0caf5;
-        @define-color headerbar_border_color rgba(192, 202, 245, 0.12);
-        @define-color headerbar_backdrop_color @window_bg_color;
-        @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
-        @define-color card_bg_color #1a1b26;
-        @define-color card_fg_color #c0caf5;
-        @define-color card_shade_color rgba(0, 0, 0, 0.36);
-        @define-color dialog_bg_color #1a1b26;
-        @define-color dialog_fg_color #c0caf5;
-        @define-color popover_bg_color #1a1b26;
-        @define-color popover_fg_color #c0caf5;
-        @define-color shade_color rgba(0, 0, 0, 0.36);
-        @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
-        @define-color sidebar_bg_color #1a1b26;
-        @define-color sidebar_fg_color #c0caf5;
-        @define-color secondary_sidebar_bg_color #1a1b26;
-        @define-color secondary_sidebar_fg_color #c0caf5;
-        @define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
-        @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
-        @define-color thumbnail_bg_color #1a1b26;
-        @define-color thumbnail_fg_color #c0caf5;
-        @define-color sidebar_backdrop_color rgba(192, 202, 245, 0.12);
-        @define-color secondary_sidebar_backdrop_color rgba(192, 202, 245, 0.12);
-        @define-color blue_1 #99c1f1;
-        @define-color blue_2 #62a0ea;
-        @define-color blue_3 #3584e4;
-        @define-color blue_4 #1c71d8;
-        @define-color blue_5 #1a5fb4;
-        @define-color green_1 #8ff0a4;
-        @define-color green_2 #57e389;
-        @define-color green_3 #33d17a;
-        @define-color green_4 #2ec27e;
-        @define-color green_5 #26a269;
-        @define-color yellow_1 #f9f06b;
-        @define-color yellow_2 #f8e45c;
-        @define-color yellow_3 #f6d32d;
-        @define-color yellow_4 #f5c211;
-        @define-color yellow_5 #e5a50a;
-        @define-color orange_1 #ffbe6f;
-        @define-color orange_2 #ffa348;
-        @define-color orange_3 #ff7800;
-        @define-color orange_4 #e66100;
-        @define-color orange_5 #c64600;
-        @define-color red_1 #f66151;
-        @define-color red_2 #ed333b;
-        @define-color red_3 #e01b24;
-        @define-color red_4 #c01c28;
-        @define-color red_5 #a51d2d;
-        @define-color purple_1 #dc8add;
-        @define-color purple_2 #c061cb;
-        @define-color purple_3 #9141ac;
-        @define-color purple_4 #813d9c;
-        @define-color purple_5 #613583;
-        @define-color brown_1 #cdab8f;
-        @define-color brown_2 #b5835a;
-        @define-color brown_3 #986a44;
-        @define-color brown_4 #865e3c;
-        @define-color brown_5 #63452c;
-        @define-color light_1 #ffffff;
-        @define-color light_2 #f6f5f4;
-        @define-color light_3 #deddda;
-        @define-color light_4 #c0bfbc;
-        @define-color light_5 #9a9996;
-        @define-color dark_1 #77767b;
-        @define-color dark_2 #5e5c64;
-        @define-color dark_3 #3d3846;
-        @define-color dark_4 #241f31;
-        @define-color dark_5 #000000;
-
-        .navigation-sidebar {
-        background-color: #1a1b26;
-        }
-      '';
-  };
+# TODO: reenable this again
+# right now its broken because flatpak...
+#  xdg.configFile."gtk-4.0/gtk.css" = {
+#    text =
+#      ''
+#        /*
+#        Generated with Gradience
+#
+#        Issues caused by theming should be reported to Gradience repository, and not to upstream
+#
+#        https://github.com/GradienceTeam/Gradience
+#        */
+#
+#        @define-color accent_color #a9b1d6;
+#        @define-color accent_bg_color #a9b1d6;
+#        @define-color accent_fg_color rgba(0, 0, 0, 0.87);
+#        @define-color destructive_color #F28B82;
+#        @define-color destructive_bg_color #F28B82;
+#        @define-color destructive_fg_color rgba(0, 0, 0, 0.87);
+#        @define-color success_color #81C995;
+#        @define-color success_bg_color #81C995;
+#        @define-color success_fg_color rgba(0, 0, 0, 0.87);
+#        @define-color warning_color #FDD633;
+#        @define-color warning_bg_color #FDD633;
+#        @define-color warning_fg_color rgba(0, 0, 0, 0.87);
+#        @define-color error_color #F28B82;
+#        @define-color error_bg_color #F28B82;
+#        @define-color error_fg_color rgba(0, 0, 0, 0.87);
+#        @define-color window_bg_color #1a1b26;
+#        @define-color window_fg_color #c0caf5;
+#        @define-color view_bg_color #1a1b26;
+#        @define-color view_fg_color #c0caf5;
+#        @define-color headerbar_bg_color #1a1b26;
+#        @define-color headerbar_fg_color #c0caf5;
+#        @define-color headerbar_border_color rgba(192, 202, 245, 0.12);
+#        @define-color headerbar_backdrop_color @window_bg_color;
+#        @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
+#        @define-color card_bg_color #1a1b26;
+#        @define-color card_fg_color #c0caf5;
+#        @define-color card_shade_color rgba(0, 0, 0, 0.36);
+#        @define-color dialog_bg_color #1a1b26;
+#        @define-color dialog_fg_color #c0caf5;
+#        @define-color popover_bg_color #1a1b26;
+#        @define-color popover_fg_color #c0caf5;
+#        @define-color shade_color rgba(0, 0, 0, 0.36);
+#        @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
+#        @define-color sidebar_bg_color #1a1b26;
+#        @define-color sidebar_fg_color #c0caf5;
+#        @define-color secondary_sidebar_bg_color #1a1b26;
+#        @define-color secondary_sidebar_fg_color #c0caf5;
+#        @define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
+#        @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
+#        @define-color thumbnail_bg_color #1a1b26;
+#        @define-color thumbnail_fg_color #c0caf5;
+#        @define-color sidebar_backdrop_color rgba(192, 202, 245, 0.12);
+#        @define-color secondary_sidebar_backdrop_color rgba(192, 202, 245, 0.12);
+#        @define-color blue_1 #99c1f1;
+#        @define-color blue_2 #62a0ea;
+#        @define-color blue_3 #3584e4;
+#        @define-color blue_4 #1c71d8;
+#        @define-color blue_5 #1a5fb4;
+#        @define-color green_1 #8ff0a4;
+#        @define-color green_2 #57e389;
+#        @define-color green_3 #33d17a;
+#        @define-color green_4 #2ec27e;
+#        @define-color green_5 #26a269;
+#        @define-color yellow_1 #f9f06b;
+#        @define-color yellow_2 #f8e45c;
+#        @define-color yellow_3 #f6d32d;
+#        @define-color yellow_4 #f5c211;
+#        @define-color yellow_5 #e5a50a;
+#        @define-color orange_1 #ffbe6f;
+#        @define-color orange_2 #ffa348;
+#        @define-color orange_3 #ff7800;
+#        @define-color orange_4 #e66100;
+#        @define-color orange_5 #c64600;
+#        @define-color red_1 #f66151;
+#        @define-color red_2 #ed333b;
+#        @define-color red_3 #e01b24;
+#        @define-color red_4 #c01c28;
+#        @define-color red_5 #a51d2d;
+#        @define-color purple_1 #dc8add;
+#        @define-color purple_2 #c061cb;
+#        @define-color purple_3 #9141ac;
+#        @define-color purple_4 #813d9c;
+#        @define-color purple_5 #613583;
+#        @define-color brown_1 #cdab8f;
+#        @define-color brown_2 #b5835a;
+#        @define-color brown_3 #986a44;
+#        @define-color brown_4 #865e3c;
+#        @define-color brown_5 #63452c;
+#        @define-color light_1 #ffffff;
+#        @define-color light_2 #f6f5f4;
+#        @define-color light_3 #deddda;
+#        @define-color light_4 #c0bfbc;
+#        @define-color light_5 #9a9996;
+#        @define-color dark_1 #77767b;
+#        @define-color dark_2 #5e5c64;
+#        @define-color dark_3 #3d3846;
+#        @define-color dark_4 #241f31;
+#        @define-color dark_5 #000000;
+#
+#        .navigation-sidebar {
+#        background-color: #1a1b26;
+#        }
+#      '';
+#  };
 }
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 9890f03..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3' && gsettings set org.gnome.desktop.interface color-scheme 'default'
-gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Classic'
-gsettings set org.gnome.desktop.interface cursor-size 24 
-
-ln -s scripts $HOME/.config/.
-
-
-nixos-rebuild switch --flake ./nix/.#$0
-
-