diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix
index a375fd7..c92e850 100644
--- a/modules/home/desktop/gnome/default.nix
+++ b/modules/home/desktop/gnome/default.nix
@@ -16,12 +16,13 @@ in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       gnomeExtensions.alphabetical-app-grid
-      gnomeExtensions.removable-drive-menu
+      gnomeExtensions.app-icons-taskbar
       gnomeExtensions.caffeine
+      gnomeExtensions.pano
+      gnomeExtensions.removable-drive-menu
       gnomeExtensions.space-bar
       gnomeExtensions.switcher
       gnomeExtensions.tactile
-      gnomeExtensions.pano
       gnomeExtensions.window-is-ready-remover
       junction
       celluloid
@@ -32,13 +33,13 @@ in {
     ];
     programs.gnome-shell.extensions = [
       {package = pkgs.gnomeExtensions.alphabetical-app-grid;}
-
-      {package = pkgs.gnomeExtensions.removable-drive-menu;}
+      {package = pkgs.gnomeExtensions.app-icons-taskbar;}
       {package = pkgs.gnomeExtensions.caffeine;}
+      {package = pkgs.gnomeExtensions.pano;}
+      {package = pkgs.gnomeExtensions.removable-drive-menu;}
       {package = pkgs.gnomeExtensions.space-bar;}
       {package = pkgs.gnomeExtensions.switcher;}
       {package = pkgs.gnomeExtensions.tactile;}
-      {package = pkgs.gnomeExtensions.pano;}
       {package = pkgs.gnomeExtensions.window-is-ready-remover;}
     ];
     gtk = {
@@ -125,8 +126,8 @@ in {
         move-to-workspace-last = ["<Shift><Control><Super>End"];
         move-to-workspace-left = ["<Control><Super>Left"];
         move-to-workspace-right = ["<Control><Super>Right"];
-        switch-input-source = ["<Super>Escape"];
-        switch-input-source-backward = ["<Shift><Super>Escape"];
+        switch-input-source = ["<Super>Space"];
+        switch-input-source-backward = ["<Shift><Super>Space"];
         switch-to-workspace-1 = ["<Super>1"];
         switch-to-workspace-2 = ["<Super>2"];
         switch-to-workspace-3 = ["<Super>3"];
@@ -160,7 +161,18 @@ in {
       };
 
       "org/gnome/shell" = {
-        enabled-extensions = ["drive-menu@gnome-shell-extensions.gcampax.github.com" "caffeine@patapon.info" "AlphabeticalAppGrid@stuarthayhurst" "appindicatorsupport@rgcjonas.gmail.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "tactile@lundal.io" "switcher@landau.fi" "pano@elhan.io" "space-bar@luchrioh"];
+        enabled-extensions = [
+          "AlphabeticalAppGrid@stuarthayhurst"
+          "appindicatorsupport@rgcjonas.gmail.com"
+          "aztaskbar@aztaskbar.gitlab.com"
+          "caffeine@patapon.info"
+          "drive-menu@gnome-shell-extensions.gcampax.github.com"
+          "pano@elhan.io"
+          "space-bar@luchrioh"
+          "switcher@landau.fi"
+          "tactile@lundal.io"
+          "user-theme@gnome-shell-extensions.gcampax.github.com"
+        ];
       };
 
       "org/gnome/shell/app-switcher" = {
@@ -192,6 +204,21 @@ in {
         workspace-indicator = true;
       };
 
+      "org/gnome/shell/extensions/aztaskbar" = with lib.hm.gvariant; {
+        favorites = true;
+        icon-size = 25;
+        icon-style = "REGULAR";
+        # intellihide = true;
+        main-panel-height = mkTuple [true 40];
+        position-offset = 4;
+        prefs-visible-page = "";
+        show-apps-button = mkTuple [true 0];
+        show-panel-activities-button = true;
+        show-weather-by-clock = "LEFT";
+        taskbar-spacing = 2;
+        # update-notifier-project-version = 30;
+      };
+
       "org/gnome/shell/extensions/tactile" = {
         background-color = "#${colors.base00}";
         border-color = "#${colors.base0D}";