diff --git a/flake.nix b/flake.nix
index f6accae..15c5343 100644
--- a/flake.nix
+++ b/flake.nix
@@ -132,7 +132,6 @@
           x86_64-linux = with import nixpkgs-unstable-raw {system = "x86_64-linux";}; {
             anything-sync-daemon = callPackage ./pkgs/anything-sync-daemon {};
             discord-krisp-fixer = callPackage ./pkgs/discord-krisp-fixer {};
-            kasane-teto-cursor = callPackage ./pkgs/kasane-teto-cursor {};
           };
         };
         nixosConfigurations = let
diff --git a/pkgs/kasane-teto-cursor b/pkgs/kasane-teto-cursor
deleted file mode 100644
index af93194..0000000
--- a/pkgs/kasane-teto-cursor
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  stdenvNoCC,
-  fetchzip,
-}:
-stdenvNoCC.mkDerivation {
-  name = "kasane-teto-cursors";
-
-  src = fetchzip {
-    url = "http://dl.everest.tailscale/Kasane%20Teto%20Cursor%20-%20by%20wobb.zip";
-    hash = "sha256-4neZqApkK6hwufLTilUtPmgzyBih7onSdSZ9lezQbIU=";
-  };
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/share/icons
-    cp -dr --no-preserve='ownership' $src/Linux/Kasane\ Teto $out/share/icons
-  '';
-}
diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix
index 5f2b7f0..a84ff77 100644
--- a/roles/gnome/gnome.nix
+++ b/roles/gnome/gnome.nix
@@ -1,4 +1,4 @@
-{pkgs, flakeSelf, ...}: {
+{pkgs, ...}: {
   services = {
     xserver = {
       displayManager.gdm.enable = true;
@@ -7,12 +7,6 @@
     gnome.gnome-browser-connector.enable = true;
   };
 
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita-dark";
-  };
-
   # Extensions
   environment.systemPackages = with pkgs.gnomeExtensions; [
     appindicator
@@ -21,33 +15,14 @@
   ];
 
   home-manager.users.toast = {
-    gtk = {
-      enable = true;
-      theme = {
-        name = "adw-gtk3-dark";
-        package = pkgs.adw-gtk3;
-      };
-      cursorTheme = {
-        name = "Kasane Teto";
-        package = flakeSelf.outputs.packages.x86_64-linux.kasane-teto-cursor;
-      };
-    };
     dconf.settings = {
       "org/gnome/shell".enabled-extensions = [
         "appindicatorsupport@rgcjonas.gmail.com"
         "dash-to-dock@micxgx.gmail.com"
         "panel-workspace-scroll@polymeilex.github.io"
       ];
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-      "org/gnome/desktop/wm/preferences" = {
-        resize-with-right-button = true;
-      };
-      "org/gnome/mutter" = {
-        dynamic-workspaces = true;
-        edge-tiling = true;
-      };
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+      "org/gnome/mutter".dynamic-workspaces = true;
     };
   };
 }
diff --git a/roles/gnome/programs/blackbox.nix b/roles/gnome/programs/blackbox.nix
index 2b18dc3..4f23c10 100644
--- a/roles/gnome/programs/blackbox.nix
+++ b/roles/gnome/programs/blackbox.nix
@@ -1,18 +1,18 @@
 {pkgs, ...}: {
-  programs.gnome-terminal.enable = false;
+	programs.gnome-terminal.enable = false;
   environment.systemPackages = with pkgs; [
     blackbox-terminal
   ];
-
+	
   home-manager.users.toast = {lib, ...}: {
     dconf.settings = with lib.hm.gvariant; {
-      "com/raggesilver/BlackBox" = {
-        # Dark mode
-        style-preference = mkUint32 2;
-        # Default working directory is home folder
-        working-directory-mode = mkUint32 1;
-        custom-font = "JetBrainsMono Nerd Font Mono 12";
-      };
+			"com/raggesilver/BlackBox" = {
+				# Dark mode
+				style-preference = mkUint32 2;
+				# Default working directory is home folder
+				working-directory-mode = mkUint32 1;
+				custom-font = "JetBrainsMono Nerd Font Mono 12";
+			};
     };
   };
 }
diff --git a/roles/gnome/programs/default.nix b/roles/gnome/programs/default.nix
index 03b33d3..9f7a57e 100644
--- a/roles/gnome/programs/default.nix
+++ b/roles/gnome/programs/default.nix
@@ -1,5 +1,5 @@
 {...}: {
-  imports = [
-    ./blackbox.nix
-  ];
+	imports = [
+		./blackbox.nix
+	];
 }
diff --git a/roles/school/default.nix b/roles/school/default.nix
index 9c84cca..82a522f 100644
--- a/roles/school/default.nix
+++ b/roles/school/default.nix
@@ -1,10 +1,11 @@
 {pkgs, ...}: {
   imports = [
-    ./programs
+    # ./programs
     ./services
   ];
   home-manager.users.toast.home.packages = with pkgs; [
     jetbrains.idea-ultimate
+    android-studio
     jetbrains.webstorm
     nodejs
   ];
diff --git a/roles/school/programs/android-studio.nix b/roles/school/programs/android-studio.nix
deleted file mode 100644
index b2b0c5f..0000000
--- a/roles/school/programs/android-studio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  programs.adb.enable = true;
-  users.users.toast.extraGroups = ["adbusers"];
-  home-manager.users.toast.home.packages = with pkgs; [
-    android-studio
-  ];
-}
diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix
deleted file mode 100644
index 13edfdf..0000000
--- a/roles/school/programs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./android-studio.nix
-  ];
-}