diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
new file mode 100644
index 0000000..4bd2456
--- /dev/null
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -0,0 +1,135 @@
+monitor=eDP-1,2256x1504@60,0x0,1.175
+
+# Startup programs
+exec-once = waybar & firefox
+
+# Programs
+$terminal = alacritty
+$fileManager = dolphin
+$menu = wofi --show drun
+
+# Default env vars
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt5ct
+
+input {
+  kb_layout = us
+  kb_variant =
+  kb_model =
+  kb_options =
+  kb_rules =
+
+  follow_mouse = 1
+
+  touchpad {
+    natural_scroll = yes
+  }
+
+  sensitivity = 0
+}
+
+general {
+  gaps_in = 5
+  gaps_out = 5
+  border_size = 2
+  col.active_border = rgba(e91e63ee) rgba(ffcdd2ee) 45deg
+  col.inactive_border = rgba(0288d1aa)
+  layout = dwindle
+  allow_tearing = false
+}
+
+decoration {
+  rounding = 5
+
+  blur {
+    enabled = true
+    size = 3
+    passes = 1
+  }
+
+  drop_shadow = yes
+  shadow_range = 4
+  shadow_render_power = 3
+  col.shadow = rgba(1a1a1aee)
+}
+
+animations {
+  enabled = yes
+  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+  animation = windows, 1, 3, myBezier
+  animation = windowsOut, 1, 7, default, popin 80%
+  animation = border, 1, 10, default
+  animation = borderangle, 1, 8, default
+  animation = fade, 1, 7, default
+  animation = workspaces, 1, 2, default
+}
+
+dwindle {
+  pseudotile = yes
+  preserve_split = yes
+}
+
+master {
+  orientation = right
+  new_is_master = true
+}
+
+gestures {
+  workspace_swipe = on
+}
+
+misc {
+  force_default_wallpaper = 0
+}
+
+windowrulev2 = suppressevent maximize, class:.*
+
+$mainMod = SUPER
+
+# Keybindings
+bind = $mainMod, return, exec, $terminal
+bind = $mainMod, Q, killactive,
+bind = $mainMod, C, exit,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, D, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus window
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index e469cde..7533671 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -3,8 +3,8 @@
     "output": ["DVI-D-0", "LVDS-1", "eDP-1"],
     "position": "top",
     "height": 35, // Waybar height (to be removed for auto height)
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
-    "modules-center": ["sway/window"],
+    "modules-left": ["hyprland/workspaces", "hyprland/mode", "sway/workspaces", "sway/mode", "custom/media"],
+    "modules-center": ["hyprland/window", "sway/window"],
     "modules-right": ["pulseaudio", "network", "backlight", "battery", "tray", "clock"],
     // Modules configuration
      "sway/workspaces": {
@@ -23,6 +23,22 @@
              "default": ""
          }
      },
+     "hyprland/workspaces": {
+         "disable-scroll": true,
+         "all-outputs": true,
+         "format": "{icon}",
+         "format-icons": {
+             "1": "1",
+             "2": "",
+             "3": "3",
+             "4": "4",
+             "5": "5",
+	     "13": "♫",
+             "urgent": "",
+             "focused": "",
+             "default": ""
+         }
+     },
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
@@ -35,6 +51,9 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "hyprland/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
     "tray": {
         // "icon-size": 21,
         "spacing": 10