diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index ba0a055..580d7a1 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -6,7 +6,7 @@
   imports =
     [
       ./hardware-configuration.nix
-      ./modules/autorandr
+      #./modules/autorandr
       ./modules/networks
       #./modules/lightdm
       #./modules/gdm
@@ -24,8 +24,9 @@
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
+    keyMap = "dvorak";
     font = "Lat2-Terminus16";
-    useXkbConfig = true; # use xkbOptions in tty.
+    #useXkbConfig = true; # use xkbOptions in tty.
   };
 
   services.xserver = {
diff --git a/users/rouven/modules/alacritty/default.nix b/users/rouven/modules/alacritty/default.nix
index c613752..4e94283 100644
--- a/users/rouven/modules/alacritty/default.nix
+++ b/users/rouven/modules/alacritty/default.nix
@@ -7,7 +7,7 @@
         TERM = "xterm-256color";
       };
       font = {
-        size = 8;
+        size = 10;
       };
       shell.program = "${pkgs.zsh}/bin/zsh";
       window.opacity = 0.7;
diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix
index d8ca26f..e6332a4 100644
--- a/users/rouven/modules/hyprland/default.nix
+++ b/users/rouven/modules/hyprland/default.nix
@@ -1,5 +1,21 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   wayland.windowManager.hyprland.enable = true;
   xdg.configFile."hypr/hyprland.conf".source = ./hyprland.conf;
+  # TODO integrate this to nix-colors
+  xdg.configFile."wofi".source = ./wofi-config;
+  home.packages = with pkgs; [
+    wofi
+    #noto-fonts-emoji
+  ];
+
+  programs.waybar = {
+    enable = true;
+    #settings = {
+    #mainBar = {
+    #layer = "top";
+    #position = "top";
+    #};
+    #};
+  };
 }
diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf
index a1767dc..c46c6eb 100644
--- a/users/rouven/modules/hyprland/hyprland.conf
+++ b/users/rouven/modules/hyprland/hyprland.conf
@@ -1,23 +1,10 @@
-
-########################################################################################
-AUTOGENERATED HYPR CONFIG.
-PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-########################################################################################
-
-#
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-#
-
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
-
+monitor=eDP-1, 1920x1080, 0x0, 1
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
+ exec-once = waybar
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -96,12 +83,6 @@ gestures {
     workspace_swipe = off
 }
 
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic mouse V1 {
-    sensitivity = -0.5
-}
-
 # Example windowrule v1
 # windowrule = float, ^(kitty)$
 # Example windowrule v2
@@ -113,19 +94,19 @@ device:epic mouse V1 {
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, O, exec, alacritty
-bind = $mainMod, C, killactive, 
+bind = $mainMod, Return, exec, alacritty
+bind = $mainMod SHIFT, Q, killactive, 
 bind = $mainMod, M, exit, 
-bind = $mainMod, V, togglefloating, 
-bind = $mainMod, R, exec, wofi --show drun
+bind = $mainMod, F, togglefloating, 
+bind = ALT, Space, exec, wofi --show drun
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, S, togglesplit, # dwindle
 
 # Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, L, movefocus, r
+bind = $mainMod, K, movefocus, u
+bind = $mainMod, J, movefocus, d
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
diff --git a/users/rouven/modules/hyprland/wofi-config/config b/users/rouven/modules/hyprland/wofi-config/config
new file mode 100644
index 0000000..46d242b
--- /dev/null
+++ b/users/rouven/modules/hyprland/wofi-config/config
@@ -0,0 +1,2 @@
+allow_images = true
+term = alacritty
diff --git a/users/rouven/modules/hyprland/wofi-config/style.css b/users/rouven/modules/hyprland/wofi-config/style.css
new file mode 100644
index 0000000..c0ba166
--- /dev/null
+++ b/users/rouven/modules/hyprland/wofi-config/style.css
@@ -0,0 +1,46 @@
+window {
+margin: 0px;
+border: 1px solid #bd93f9;
+background-color: #282a36;
+}
+
+#input {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+background-color: #44475a;
+}
+
+#inner-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#outer-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#scroll {
+margin: 0px;
+border: none;
+}
+
+#text {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+}
+
+#entry:selected {
+background-color: #44475a;
+}
+
+#entry:nth-child(even){
+background-color: #404552;
+}
+#entry:nth-child(odd){
+background-color: #404552;
+}
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index b3d0af5..0b9dddb 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -5,11 +5,9 @@
     wpa_supplicant_gui
     pcmanfm
     xsel
-    lightlocker
     vlc
 
     # graphics
-    feh
     okular
     gimp
 
@@ -45,10 +43,10 @@
     neofetch
     trash-cli
     spotify
-    nixpkgs-fmt
     virt-manager
     powerline-fonts
     ventoy-bin
+    mpd
 
     # libs
     libyubikey