diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix
deleted file mode 100644
index 2075753..0000000
--- a/roles/common/programs/bat.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	home-manager = {
-		users.toast.programs.bat = {
-			enable = true;
-			config = {
-				theme = "catppuccin-mocha";
-			};
-			themes = {
-				catppuccin-mocha = {
-					src = pkgs.fetchFromGitHub {
-						owner = "catppuccin";
-						repo = "bat";
-						rev = "master";
-						hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-					};
-					file = "Catppuccin-mocha.tmTheme";
-				};
-			};
-		};
-	};
-}
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index c6ab698..53af6f3 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -11,12 +11,10 @@
 		./bash.nix
 		./git.nix
 		./starship.nix
-		./bat.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
 		speedtest-cli
-		# Bat has a home manager module, but I want it to be available system wide
 		bat
 		file
 		nvd
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index d2e86dd..f0ba955 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -142,12 +142,9 @@ in
 				};
 			};
 			configFile = {
-				"kwinrc" = {
-					"Desktops" = {
-						"Number" = 2;
-						"Rows" = 1;
-					};
-					"TabBox"."LayoutName" = "thumbnail_grid";
+				"kwinrc"."Desktops" = {
+					"Number" = 2;
+					"Rows" = 1;
 				};
 			};
 		};
diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
index 8537e27..2ee7f0c 100644
--- a/roles/school/programs/idea.nix
+++ b/roles/school/programs/idea.nix
@@ -1,22 +1,15 @@
-{ config, pkgs, ... }:
+ { config, pkgs, ... }:
 
-with pkgs;
 {
-	environment.systemPackages = with jetbrains; [
+	environment.systemPackages = with pkgs; with jetbrains; [
 		idea-ultimate
 	];
 
 	home-manager.users.toast = {
 		# Install plugins
-		home.file = {
-			".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = fetchurl {
-				url = "https://github.com/catppuccin/jetbrains/releases/download/v3.0.0/Catppuccin.Theme-3.0.0.jar";
-				hash = "sha256-tbcUtqA8wo9ZLjfkziRZiDTN748qWQ26A80pIJrTYuM";
-			};
-			".local/share/JetBrains/IntelliJIdea2023.2/rainbow-brackets".source = fetchzip {
-				url = "https://github.com/izhangzhihao/intellij-rainbow-brackets/releases/download/2023.3.6/intellij-rainbow-brackets-2023.3.6.zip";
-				hash = "sha256-ZoBVRPZZn8QjXSLtskRtSpGoadc8KNKxsKvdcyNXT74";
-			};
+		home.file.".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = builtins.fetchurl {
+			url = "https://github.com/catppuccin/jetbrains/releases/download/v2.2.0/Catppuccin.Theme-2.2.0.jar";
+			sha256 = "143jrhdfg7q24mnnzgqwgxq4glsxznxc6awcifpghr9q6nw1hfi0";
 		};
 
 		/*