diff --git a/extra/bluetooth-audio.nix b/extra/bluetooth-audio.nix
index 9c89ed5..0c9540d 100644
--- a/extra/bluetooth-audio.nix
+++ b/extra/bluetooth-audio.nix
@@ -4,7 +4,7 @@
   hardware.bluetooth = {
     enable = true;
     package = pkgs.bluezFull;
-    config = {
+    settings = {
       General = {
         Enable = "Source,Sink,Media,Socket";
       };
diff --git a/extra/default.nix b/extra/default.nix
index b3c43ca..ebf1126 100644
--- a/extra/default.nix
+++ b/extra/default.nix
@@ -20,7 +20,7 @@ in
   # gnome services
   services.dbus.packages = [ pkgs.gnome3.dconf ];
   services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
-  services.gnome3 = {
+  services.gnome = {
     gnome-keyring.enable = true;
     glib-networking.enable = true;  # network-mount
   };
diff --git a/extra/fonts.nix b/extra/fonts.nix
index 957fe2e..c037664 100644
--- a/extra/fonts.nix
+++ b/extra/fonts.nix
@@ -26,4 +26,5 @@
       #unifont # unicode
     ];
   };
+  nixpkgs.config.joypixels.acceptLicense = true;
 }
diff --git a/extra/location.nix b/extra/location.nix
index 7c25d45..974cb4d 100644
--- a/extra/location.nix
+++ b/extra/location.nix
@@ -3,22 +3,24 @@
 {
   location.provider = "geoclue2";
 
-  services.geoclue2.enable = true;
-  services.geoclue2.enableDemoAgent = true;
-  services.geoclue2.appConfig."gammastep" = {
-    desktopID = "gammastep";
-    isAllowed = true;
-    isSystem = false;
-    # Empty list allows all users
-    users = [ ];
-  };
+  services.geoclue2 = {
+    enable = true;
+    enableDemoAgent = true;
 
-  services.geoclue2.appConfig."gammastep-indicator" = {
-    desktopID = "gammastep-indicator";
-    isAllowed = true;
-    isSystem = false;
-    # Empty list allows all users
-    users = [ ];
-  };
+    appConfig."gammastep" = {
+      desktopID = "gammastep";
+      isAllowed = true;
+      isSystem = false;
+      # Empty list allows all users
+      users = [ ];
+    };
+    appConfig."gammastep-indicator" = {
+      desktopID = "gammastep-indicator";
+      isAllowed = true;
+      isSystem = false;
+      # Empty list allows all users
+      users = [ ];
+    };
 
+  };
 }
diff --git a/extra/media.nix b/extra/media.nix
index 873ec94..c2a02d9 100644
--- a/extra/media.nix
+++ b/extra/media.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   environment.systemPackages = with pkgs; [
     audacity
@@ -13,9 +10,9 @@ in
     imagemagick
     image_optim
     inkscape
-    unstable.puddletag # audio tagging
+    puddletag # audio tagging
     mp3val
-    unstable.mediaelch
+    mediaelch
     picard
     projectm
     shotwell
diff --git a/extra/meeting.nix b/extra/meeting.nix
index 0e9ecc0..054ba94 100644
--- a/extra/meeting.nix
+++ b/extra/meeting.nix
@@ -1,12 +1,9 @@
 { config, lib, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   environment.systemPackages = with pkgs; [
     element-desktop
     mumble
-    unstable.nheko
+    nheko
     pidgin
     skypeforlinux
     signal-desktop
diff --git a/extra/sync.nix b/extra/sync.nix
index 32605bb..088e080 100644
--- a/extra/sync.nix
+++ b/extra/sync.nix
@@ -1,11 +1,8 @@
 { config, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   environment.systemPackages = with pkgs; [
     nextcloud-client
-    unstable.syncthing
+    syncthing
     magic-wormhole
     vdirsyncer
   ];
diff --git a/extra/tex.nix b/extra/tex.nix
index 6dc4d1e..f1e2f7b 100644
--- a/extra/tex.nix
+++ b/extra/tex.nix
@@ -1,10 +1,7 @@
 { config, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   environment.systemPackages = with pkgs; [
-    unstable.jabref
+    jabref
     biber
     texlive.combined.scheme-full
     texstudio
diff --git a/extra/thunderbolt.nix b/extra/thunderbolt.nix
index 01b223b..64b734b 100644
--- a/extra/thunderbolt.nix
+++ b/extra/thunderbolt.nix
@@ -1,7 +1,4 @@
 { config, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   environment.systemPackages = with pkgs; [
     thunderbolt
diff --git a/sway.nix b/sway.nix
index 131078e..856bee8 100644
--- a/sway.nix
+++ b/sway.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-let
-  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
-in
 {
   programs.light.enable = true;
 
@@ -9,7 +6,7 @@ in
     polkit_gnome
   ];
   environment.pathsToLink = [ "/libexec" ];
-  #programs.wshowkeys.enable = true;
+  programs.wshowkeys.enable = true;
 
   programs.sway = {
     enable = true;
@@ -24,7 +21,7 @@ in
       dmenu
       gammastep
       grim
-      unstable.i3status-rust
+      i3status-rust
       mako
       slurp
       swayidle
@@ -34,7 +31,7 @@ in
       wl-clipboard
       wofi
       xwayland
-      unstable.wshowkeys
+      wshowkeys
     ];
 
 
diff --git a/thinkman.nix b/thinkman.nix
index e03754d..d9d112f 100644
--- a/thinkman.nix
+++ b/thinkman.nix
@@ -55,7 +55,7 @@
     options = "--delete-older-than 30d";
   };
 
-  system.stateVersion = "20.09";
+  system.stateVersion = "21.05";
   system.autoUpgrade.enable = true;
-  system.autoUpgrade.channel = https://nixos.org/channels/nixos-20.09;
+  system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
 }