diff --git a/home/natto/config/hypr/hyprland.conf b/home/natto/config/hypr/hyprland.conf
index b4d8ede..1d79762 100644
--- a/home/natto/config/hypr/hyprland.conf
+++ b/home/natto/config/hypr/hyprland.conf
@@ -18,6 +18,7 @@ input {
     }
 
     repeat_delay = 300
+    accel_profile = flat
 }
 
 general {
@@ -69,6 +70,9 @@ gestures {
     workspace_swipe = off
 }
 
+misc {
+    no_direct_scanout = true
+}
 
 windowrule=float, ^.*(iwgtk)$
 
diff --git a/home/natto/config/mpd/mpd.conf b/home/natto/config/mpd/mpd.conf
index 1bb186b..efc39b9 100644
--- a/home/natto/config/mpd/mpd.conf
+++ b/home/natto/config/mpd/mpd.conf
@@ -9,6 +9,7 @@ pid_file                        "~/.config/mpd/pid"
 bind_to_address                 "0.0.0.0"
 bind_to_address                 "~/.config/mpd/socket"
 restore_paused "yes"
+
 input {
         plugin "curl"
 }
@@ -19,7 +20,7 @@ audio_output {
 audio_output {
         type "fifo"
         name "Visualizer feed"
-        path "/tmp/g.fifo"
+        path "/tmp/mpd.fifo"
         format "44100:16:2"
 }
 audio_output {
diff --git a/home/natto/config/ncmpcpp/config b/home/natto/config/ncmpcpp/config
index a61d2cc..0c75aca 100644
--- a/home/natto/config/ncmpcpp/config
+++ b/home/natto/config/ncmpcpp/config
@@ -19,17 +19,18 @@ mpd_music_dir=/home/natto/Music
 now_playing_prefix=> 
 playlist_display_mode=columns
 playlist_editor_display_mode=classic
+progressbar_elapsed_color=magenta
 progressbar_color=green
 progressbar_look=▃▃▃
 regular_expressions=extended
-song_columns_list_format=(4)[red]{l} (20)[cyan]{t} (25)[green]{a} (25)[magenta]{b}
+song_columns_list_format=(4)[red]{l} (40)[cyan]{t} (15)[green]{a} (25)[magenta]{b}
 song_list_format=$(yellow){%a} - $(blue){%t}
 song_status_format= $6%a $7⟫⟫ $3%t $7⟫⟫ $4%b 
 statusbar_visibility=yes
 system_encoding=utf-8
 titles_visibility=yes
 user_interface=alternative
-visualizer_data_source=/tmp/g.fifo
+visualizer_data_source=/tmp/mpd.fifo
 visualizer_fps=144
 visualizer_in_stereo=yes
 visualizer_look=◆▋
diff --git a/home/natto/config/neomutt/neomuttrc b/home/natto/config/neomutt/neomuttrc
index 2a49723..134ee5e 100644
--- a/home/natto/config/neomutt/neomuttrc
+++ b/home/natto/config/neomutt/neomuttrc
@@ -10,15 +10,15 @@ bind attach,index,pager e previous-entry
 bind attach,index,pager 9 group-reply
 bind pager g top
 bind pager G bottom
-bind pager n next-line
-bind pager e previous-line
-bind pager i view-attachments
+bind pager j next-line
+bind pager k previous-line
+bind pager l view-attachments
 bind attach,index g first-entry
 bind attach,index G last-entry
-bind index,pager \CE sidebar-prev                 
-bind index,pager \CN sidebar-next                 
-bind index,pager \CI sidebar-open                 
-bind index,pager \CB sidebar-toggle-visible       
+bind index,pager \CK sidebar-prev
+bind index,pager \CJ sidebar-next
+bind index,pager \CI sidebar-open
+bind index,pager \CB sidebar-toggle-visible
 set sleep_time = 0		
 set markers = no		
 set mark_old = no		
diff --git a/home/natto/default.nix b/home/natto/default.nix
index 98f7715..e0ae6ad 100644
--- a/home/natto/default.nix
+++ b/home/natto/default.nix
@@ -10,7 +10,7 @@
     ./email.nix
     ./programs.nix
     ./eww
-    # ./xsession.nix :(
+    # ./xsession.nix
     ./wayland.nix
     ./pkgs.nix
     ./stuff.nix
@@ -18,7 +18,7 @@
     ./gtk.nix
     ./dunst.nix
     ./git.nix
-    ./mpd.nix
+    ./music.nix
     ./zsh.nix
   ];
 }
diff --git a/home/natto/emacs.nix b/home/natto/emacs.nix
index 6726ce5..5730a3a 100644
--- a/home/natto/emacs.nix
+++ b/home/natto/emacs.nix
@@ -3,23 +3,13 @@ let
   mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
     with pkgs; emacsWithPackagesFromUsePackage {
       inherit config;
-      package = emacsPgtkGcc;
+      package = emacsPgtk;
       alwaysEnsure = true;
       alwaysTangle = true;
       extraEmacsPackages = epkgs: with epkgs; [
         use-package
         (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
       ];
-      override = epkgs: epkgs // {
-        catppuccin-theme = epkgs.melpaPackages.catppuccin-theme.overrideAttrs (_: {
-          src = pkgs.fetchFromGitHub {
-            owner = "natto1784";
-            repo = "catppuccin-emacs";
-            rev = "company";
-            sha256 = "sha256-wI+RiOeRrvV5eXXVs6hBb3x9BMD9HgHmsjom7kzAFJg=";
-          };
-        });
-      };
     };
 in
 {
diff --git a/home/natto/eww/bar/hyprworkspaces b/home/natto/eww/bar/hyprworkspaces
index 94acd28..845cd59 100755
--- a/home/natto/eww/bar/hyprworkspaces
+++ b/home/natto/eww/bar/hyprworkspaces
@@ -9,7 +9,7 @@
 # active workspace
 current=1
 list_workspaces() {
-    workspace_list=$(hyprctl -j workspaces | jq -rc '[.[]|.id]|sort')
+    workspace_list=$(hyprctl -j workspaces | jq -rc '[.[]|.id]|sort' || "[]")
 }
 
 workspaces() {
@@ -18,7 +18,7 @@ workspaces() {
 
 list_workspaces
 workspaces
-hyprctl dispatch workspace $current || true
+hyprctl dispatch workspace $current &>/dev/null || true
 
 socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | while read -r event; do
   case ${event%>>*} in
diff --git a/home/natto/eww/bar/hyprworkspaces.yuck b/home/natto/eww/bar/hyprworkspaces.yuck
index 97decde..0343b3e 100644
--- a/home/natto/eww/bar/hyprworkspaces.yuck
+++ b/home/natto/eww/bar/hyprworkspaces.yuck
@@ -1,4 +1,4 @@
-(deflisten workspace "bar/hyprworkspaces")
+(deflisten workspace :initial "{}" "bar/hyprworkspaces")
 (defvar numerals "[\"१\", \"२\", \"३\", \"४\", \"५\", \"६\", \"७\", \"८\", \"९\", \"०\"]")
 
 (defwidget workspaces []
diff --git a/home/natto/eww/bar/system.yuck b/home/natto/eww/bar/system.yuck
index a91bc17..a15733a 100644
--- a/home/natto/eww/bar/system.yuck
+++ b/home/natto/eww/bar/system.yuck
@@ -89,7 +89,6 @@
              (button
               :visible {system_net_wifi != ""}
               :tooltip {system_net_wifi}
-              :onclick "iwgtk &"
               ""))))
 
 (defwidget system_info []
diff --git a/home/natto/music.nix b/home/natto/music.nix
index 58de995..aed732d 100644
--- a/home/natto/music.nix
+++ b/home/natto/music.nix
@@ -23,7 +23,7 @@ in
         id = 1039532008424099850; # dont really care
         format = {
           large_image = "koishi";
-          small_image = "";
+          small_image = "koishifumo";
           large_text = "real";
           small_text = "the";
         };
@@ -74,6 +74,9 @@ in
       })
       mpc_cli
       playerctl
+      (tauon.override {
+        withDiscordRPC = true;
+      })
     ];
 
     file.ncmpcpp = {
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 49ffe93..1831c99 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -47,18 +47,17 @@
     dunst
     authy
     gnome.zenity
-    iwgtk
 
     # Wine and games and stuff
+    wineWowPackages.stable
     steam
     winetricks
     lutris
     flake.packages.${pkgs.system}.tlauncher
     mangohud
-    inputs.nix-gaming.packages.${pkgs.system}.osu-stable
+    inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
 
     # Programming and dev stuff
-    rust-analyzer
     (texlive.combine {
       inherit (texlive)
         scheme-small
diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix
index fc47ecc..d7caf7e 100644
--- a/home/natto/stuff.nix
+++ b/home/natto/stuff.nix
@@ -33,10 +33,8 @@
   };
   i18n = {
     inputMethod = {
-      #   enabled = "fcitx5";
-      #  fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
-      enabled = "fcitx";
-      fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
+      enabled = "fcitx5";
+      fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
     };
   };
 }
diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix
index 27cf2a3..2dc5042 100644
--- a/home/natto/wayland.nix
+++ b/home/natto/wayland.nix
@@ -49,7 +49,6 @@
 
   home.packages = with pkgs; [
     tofi
-    wineWowPackages.waylandFull
     imv
     grim
     slurp
diff --git a/home/natto/xsession.nix b/home/natto/xsession.nix
index 037411b..ede0022 100644
--- a/home/natto/xsession.nix
+++ b/home/natto/xsession.nix
@@ -31,7 +31,6 @@
     flameshot
     xmobar
     stalonetray
-    wineWowPackages.stable
   ];
 
   home.file.stalonetray = {