diff --git a/configuration.nix b/configuration.nix
index 43d0358..6dcfaa0 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -42,6 +42,8 @@
     variables = {
       EDITOR = "nvim";
       TERMINAL = "alacritty";
+
+      # for Sway
       MOZ_USE_XINPUT2 = "1";
       _JAVA_AWT_WM_NONREPARENTING = "1";
       GTK_THEME = "Adwaita-dark";
@@ -62,22 +64,7 @@
     };
   };
 
-  security = {
-    pam = {
-      u2f = {
-        enable = true;
-        authFile = "/etc/u2f_keys";
-        cue = true;
-      };
-      services.swaylock.u2fAuth = false;
-      services.i3lock.u2fAuth = false;
-      services.login.u2fAuth = false;
-      services.sytemd-user.u2fAuth = false;
-      services.xlock.u2fAuth = false;
-      services.xscreensaver.u2fAuth = false;
-    };
-    polkit.enable = true;
-  };
+  security.polkit.enable = true;
 
   services = {
     avahi = {
@@ -96,7 +83,6 @@
     keybase.enable = true;
     logind.extraConfig = "HandlePowerKey=suspend";
     pcscd.enable = true;
-    pipewire.enable = true;
     tor = {
       enable = true;
       client.enable = true;
@@ -157,21 +143,11 @@
       enable = true;
       wrapperFeatures.gtk = true;
     };
-    light.enable = true;
     wireshark = {
       enable = true;
       package = pkgs.wireshark-qt;
     };
-    firejail.enable = true;
     fish.enable = true;
-    xonsh = {
-      # enable = true;
-      package = pkgs.xonsh.overridePythonAttrs (
-        old: {
-          propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.python3Packages.nixpkgs ];
-        }
-      );
-    };
   };
 
   users = {
@@ -191,7 +167,4 @@
   };
   systemd.extraConfig = "DefaultLimitCORE=infinity";
   security.pam.loginLimits = [ { domain = "*"; item = "core"; type = "hard"; value = "infinity"; } ];
-
-  system.stateVersion = "19.03";
-
 }
diff --git a/mpd.nix b/mpd.nix
deleted file mode 100644
index f0e2f32..0000000
--- a/mpd.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services = {
-    mpd = {
-      enable = true;
-      startWhenNeeded = true;
-      network.listenAddress = "any";
-      dataDir = "/data/var/mpd";
-      musicDirectory = "/data/Musik";
-    };
-    ympd.enable = true;
-  };
-}
diff --git a/packages.nix b/packages.nix
index 4b8fec2..37ddd79 100644
--- a/packages.nix
+++ b/packages.nix
@@ -14,7 +14,7 @@ in
   {
     environment.systemPackages = (with pkgs; [
     # Audiovisual
-    # audacity
+    audacity
     darktable
     exiftool
     ffmpeg-full
@@ -66,6 +66,7 @@ in
     lm_sensors
     manpages
     nethogs
+    nvme-cli
     parted
     pinentry-curses
     pinentry-gtk2 # needed for tomb
@@ -196,6 +197,7 @@ in
     yosys
 
     # Radio
+    gr-limesdr
     limesuite
     gnuradio-with-packages
     soapysdr
@@ -226,6 +228,7 @@ in
     syncthing-gtk
 
     # GUI tools
+    alacritty
     evince
     gnome3.eog
     gnome3.gnome-system-monitor
@@ -234,17 +237,15 @@ in
     zathura
 
     # Web
-    # (chromium.override { useOzone = true; })
     chromium
     fullFirefox
-    # tor-browser-bundle-bin
+    tor-browser-bundle-bin
 
     # Communication
     discord
     signal-desktop
     slack
     tdesktop
-    weechat
 
     # Gnome configuration
     gnome3.adwaita-icon-theme
@@ -258,16 +259,8 @@ in
 
     # Games
     multimc
-    steam
     steam-run
 
-    # Game dependencies
-    gnome3.zenity # Steam requires zenity
-    SDL2 SDL2_ttf SDL2_image
-
-    # Debug info
-    wayland.debug
-
     # Dictionaries
   ]) ++ (with pkgs.hunspellDicts; [
     en-us-large
diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix
index e452beb..d8bf764 100644
--- a/system/rainbowdash/default.nix
+++ b/system/rainbowdash/default.nix
@@ -17,4 +17,13 @@
     upower.enable = true;
     throttled.enable = true;
   };
+
+  programs.light.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    i7z
+    linuxPackages.cpupower
+  ];
+
+  system.stateVersion = "20.03";
 }
diff --git a/system/starlight/boot-config.nix b/system/starlight/boot-config.nix
index efcc9c4..5dd1a83 100644
--- a/system/starlight/boot-config.nix
+++ b/system/starlight/boot-config.nix
@@ -27,20 +27,18 @@
         };
       };
     };
-
-    binfmt.emulatedSystems = [ "wasm32-wasi" "wasm64-wasi" "armv7l-linux" "aarch64-linux" ];
   };
 
   services.udev = {
     packages = [
       pkgs.android-udev-rules
       pkgs.openocd
-      (pkgs.callPackage ./externals/rules/adafruit.nix { })
-      (pkgs.callPackage ./externals/rules/ds4drv.nix { })
-      (pkgs.callPackage ./externals/rules/fpga.nix { })
-      (pkgs.callPackage ./externals/rules/limesuite.nix { })
-      (pkgs.callPackage ./externals/rules/cm-rgb.nix { })
-      (pkgs.callPackage ./externals/rules/uhk.nix { })
+      (pkgs.callPackage ../../externals/rules/adafruit.nix { })
+      (pkgs.callPackage ../../externals/rules/ds4drv.nix { })
+      (pkgs.callPackage ../../externals/rules/fpga.nix { })
+      (pkgs.callPackage ../../externals/rules/limesuite.nix { })
+      (pkgs.callPackage ../../externals/rules/cm-rgb.nix { })
+      (pkgs.callPackage ../../externals/rules/uhk.nix { })
     ];
   };
 }
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
new file mode 100644
index 0000000..6ca863b
--- /dev/null
+++ b/system/starlight/default.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./boot-config.nix ./hardware-configuration.nix ];
+
+  networking.hostName = "starlight";
+
+  hardware.cpu.amd.updateMicrocode = true;
+  services = {
+    tor = {
+      enable = true;
+      client.enable = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    steam
+
+    gnome3.zenity
+    SDL2 SDL2_ttf SDL2_image
+  ];
+
+  system.stateVersion = "19.09";
+}