diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix
index 9a62d6d..a2c7520 100644
--- a/machines/jupiter/configuration.nix
+++ b/machines/jupiter/configuration.nix
@@ -5,7 +5,6 @@
     ./disks.nix
     ./hardware-configuration.nix
     ./environments.nix
-    # ./system.nix use docker here
   ];
 
   networking.hostName = "jupiter";
@@ -24,16 +23,6 @@
       ];
     };
 
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  # services.xserver.displayManager.gdm.enable = true;
-  # services.xserver.desktopManager.gnome.enable = true;
-
-  # services.xserver.enable = true;
-  # services.xserver.displayManager.sddm.enable = true;
-
   services.openssh.enable = true;
 
   # Configure keymap in X11
diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix
index 8df0bbb..f577fa7 100644
--- a/modules/environments/apps/default.nix
+++ b/modules/environments/apps/default.nix
@@ -17,29 +17,16 @@ let
       firefox
       thunderbird
 	    google-chrome
-	    xfce.thunar
       vscode
 	    discord
 	    spotify
 	    keepassxc
       moonlight-qt
 	    nextcloud-client
-	    neovim
 	    pipewire
+      wireplumber
 	    vlc
-	    wireplumber
       ghostty
-	    numix-icon-theme
-    ] ++ lib.optionals cfg.dev_apps [
-        jetbrains.webstorm
-        jetbrains.goland
-        jetbrains.pycharm-professional
-        jetbrains.idea-ultimate
-        go
-      ] ++ lib.optionals cfg.gnome_apps [
-          gnomeExtensions.tweaks-in-system-menu
-          gnomeExtensions.wireless-hid
-          gnome.gnome-tweaks
-      ];
+    ];
     };    
   }
diff --git a/modules/environments/dev_server/default.nix b/modules/environments/dev_server/default.nix
deleted file mode 100644
index 9d4adec..0000000
--- a/modules/environments/dev_server/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.profiles.dev_server;
- in {
-  options.my.profiles.dev_server = with lib; {
-    enable = mkEnableOption "Development Server environment";
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.dev_server = {
-      enable = true;
-      nvidiaPatches = true;
-      xwayland.enable = true;
-    };
-    users.users.finn.packages = with pkgs; [
-      # Software
-    ];
-  };
-
-}
diff --git a/modules/environments/development/default.nix b/modules/environments/development/default.nix
index 499af0a..ca9fcea 100644
--- a/modules/environments/development/default.nix
+++ b/modules/environments/development/default.nix
@@ -12,6 +12,21 @@ in {
       vscode
       neovim
       jetbrains.idea-ultimate
+      go
+      (python3.withPackages (
+        ps: with ps; [
+          jupyter # notebooks
+          matplotlib
+          numpy
+          pandas
+          pillow
+          plotly
+          scikitlearn
+          scipy
+          tqdm # progressbar in pandas
+          wheel # python development
+        ]
+      ))
     ];
   };
 }
diff --git a/modules/environments/kde-desktop/default.nix b/modules/environments/kde-desktop/default.nix
index d8f6145..3a554db 100644
--- a/modules/environments/kde-desktop/default.nix
+++ b/modules/environments/kde-desktop/default.nix
@@ -2,8 +2,6 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.my.profiles.kde-desktop;
-  # domain = config.networking.domain;
-  # port = 9696;
 in
 {
   options.my.profiles.kde-desktop = with lib; {
@@ -18,6 +16,7 @@ in
     };
     users.users.finn.packages = with pkgs; [
       # Programms can be added here...
+      numix-icon-theme
     ];
   };
 }
\ No newline at end of file