diff --git a/home/sway/kitty.nix b/home/sway/kitty.nix
index 6284487..1827304 100644
--- a/home/sway/kitty.nix
+++ b/home/sway/kitty.nix
@@ -6,7 +6,7 @@
   '';
   programs.kitty = {
     enable = true;
-    font.name = "Comic Mono";
+    font.name = "Comic Code";
     settings = {
       font_size = 20;
       bold_font = "auto";
diff --git a/home/sway/sway.nix b/home/sway/sway.nix
index d34ffca..2eec406 100644
--- a/home/sway/sway.nix
+++ b/home/sway/sway.nix
@@ -61,7 +61,7 @@
         };
 
         keybindings = {
-          "${cfg.modifier}+Return" = "${cfg.terminal}";
+          "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
 
           "${cfg.modifier}+Left" = "focus left";
           "${cfg.modifier}+Down" = "focus down";
@@ -82,7 +82,8 @@
           "XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
           "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5";
           "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
-          "${cfg.modifier}+Print" = "exec ${pkgs.bash}/bin/bash -c '~/.local/bin/elixiremanager.sh -w'";
+          "Print" = "exec ${pkgs.grim}/bin/grim - | ${pkgs.wl-clipboard}/bin/wl-copy";
+          "Shift+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy";
 
           "${cfg.modifier}+d" = "exec ${cfg.menu}";
           "${cfg.modifier}+f" = "fullscreen";
@@ -94,12 +95,7 @@
         } // (lib.foldl lib.recursiveUpdate {} (map (workspace: {
           "${cfg.modifier}+${workspace}" = "workspace ${workspace}";
           "${cfg.modifier}+Shift+${workspace}" = "move container to workspace ${workspace}";
-        }) [ "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" ]));
-
-        keycodebindings = {
-          "--no-repeat 107" = "exec dbus-send --session --type=method_call --dest=net.sourceforge.mumble.mumble / net.sourceforge.mumble.Mumble.startTalking";
-          "--release 107" = "exec dbus-send --session --type=method_call --dest=net.sourceforge.mumble.mumble / net.sourceforge.mumble.Mumble.stopTalking";
-        };
+        }) [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ]));
       };
       wrapperFeatures.gtk = true;
       extraConfig = ''
@@ -110,37 +106,16 @@
     };
     programs.waybar = {
       enable = true;
-      #       style = ''
-      #         * {
-      #           font-family: Iosevka;
-      #         }
-      #       '';
+             style = ''
+               * {
+                 font-family: "Comic Code";
+                 font-size: 20px;
+               }
+             '';
       settings = [{
         modules-left = [ "sway/workspaces" "sway/mode" ];
         modules-center = [ "sway/window" ];
-        modules-right = [ "pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray" ];
-
-        modules = {
-          battery = {
-            states = {
-              good = 95;
-              warning = 30;
-              critical = 15;
-            };
-            format = "{capacity}% {icon}";
-            format-charging = "{capacity}% ";
-            format-plugged = "{capacity}% ";
-            format-alt = "{time} {icon}";
-            format-icons = ["" "" "" "" ""];
-          };
-          network = {
-            format-wifi = "{essid} ({signalStrength}%) ";
-            format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
-            format-linked = "{ifname} (No IP) ";
-            format-disconnected = "Disconnected ⚠";
-            format-alt = "{ifname}: {ipaddr}/{cidr}";
-          };
-        };
+        modules-right = [ "pulseaudio" "battery" "clock" "tray" ];
       }];
     };
 }
diff --git a/hosts/nixos.nix b/hosts/nixos.nix
index 377e896..e9cf474 100644
--- a/hosts/nixos.nix
+++ b/hosts/nixos.nix
@@ -4,8 +4,6 @@
   imports = with tree; [
     profiles.dev
     profiles.gui
-    profiles.x11
-    profiles.xfce
     profiles.laptop
     profiles.pulse
     profiles.network_manager