diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index dba2b1d..186da4d 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -37,9 +37,9 @@
 
 (set-fontset-font "fontset-default" nil (font-spec :size 15 :name "Meterial Icons"))
 
-(setq doom-font (font-spec :family "UbuntuMono" :size 15)
-      doom-variable-pitch-font (font-spec :family "UbuntuMono" :size 15)
-      doom-big-font (font-spec :family "UbuntuMono" :size 24))
+(setq doom-font (font-spec :family "Monocraft" :size 15)
+      doom-variable-pitch-font (font-spec :family "Monocraft" :size 15)
+      doom-big-font (font-spec :family "Monocraft" :size 24))
 
 (require 'whitespace)
 (setq whitespace-line-column 99)
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 6db380c..b24dd99 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family	 Ubuntu Mono
+font_family	 Monocraft
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
new file mode 100644
index 0000000..8672d9a
--- /dev/null
+++ b/waybar/.config/waybar/config
@@ -0,0 +1,165 @@
+{
+    // "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 30, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    "spacing": 4, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": ["river/tags", "custom/media"],
+    "modules-center": [],
+    "modules-right": ["idle_inhibitor", "pulseaudio","network", "cpu", "memory", "battery", "clock", "tray"],
+    // Modules configuration
+    "wlr/workspaces": {
+        "format": "{icon}",
+        "on_click": "activate",
+        "format-icons": {
+                        "1": "一",
+                        "2": "二",
+                        "3": "三",
+                        "4": "四",
+                        "5": "五",
+                        "6": "六",
+                        "7": "七",
+                        "8": "八",
+                        "9": "九",
+        },
+        "active-only": false,
+        "sort-by-name": true,
+    },
+    "river/tags": {
+    "num-tags": 9,
+    "tag-labels": ["一","二","三","四","五","六","七","八","九"]
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "network": {
+        "interface": "enp3s0", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} 囹",
+        "tooltip-format": "{ifname} via {gwaddr} 囹",
+        "format-linked": "{ifname} (No IP) 囹",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
+}
+
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
new file mode 100644
index 0000000..d4c2925
--- /dev/null
+++ b/waybar/.config/waybar/style.css
@@ -0,0 +1,138 @@
+* {
+    border: none;
+    border-radius: 0;
+    font-family: "FiraCode Nerd Font";
+    font-size: 13px;
+    min-height: 0;
+}
+
+window#waybar {
+    /*background: transparent;*/
+    background: #282a36;
+    color: #f8f8f2;
+}
+
+#window {
+    font-weight: normal;
+    font-family: "FiraCode Nerd Font";
+}
+
+#workspaces {
+    padding: 0 5px;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    color: #f8f8f2;
+}
+
+#workspaces button.visible {
+  color: inherit;
+  background-color: #6a548d
+}
+
+#workspaces button.active{
+  color: inherit;
+  background-color: #6a548d
+}
+
+#workspaces button.focused {
+    color: #f8f8f2;
+    background-color: #aa86e1 ;
+}
+
+#workspaces button.urgent {
+  color: #ea6962;
+}
+#workspaces button.hidden {
+  color: #ea6962;
+}
+
+#tags button {
+    padding: 0 5px;
+    color: #f8f8f2;
+}
+
+#tags button.occupied {
+  color: inherit;
+  background-color: #6a548d
+}
+
+
+
+#tags button.focused {
+    color: #f8f8f2;
+    background-color: #aa86e1 ;
+}
+
+#tags button.urgent {
+  color: #ea6962;
+}
+
+#mode {
+    background: #64727D;
+    border-bottom: 3px solid #f8f8f2;
+}
+
+#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode, #custom-wofi-power {
+    padding: 0 10px;
+    margin: 0 2px;
+}
+
+#clock {
+    font-weight: normal;
+}
+
+#battery {
+}
+
+#battery icon {
+    color: #ff5555;
+}
+
+#battery.charging {
+}
+
+@keyframes blink {
+    to {
+        background-color: #f8f8f2;
+        color: black;
+    }
+}
+
+#battery.warning:not(.charging) {
+    color: #f8f8f2;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#cpu {
+}
+
+#memory {
+}
+
+#network {
+}
+
+#network.disconnected {
+    background: #ff5555;
+}
+
+#pulseaudio {
+}
+
+#pulseaudio.muted {
+}
+
+#custom-spotify {
+    color: #bd93f9;
+    /*color: #6272a4;*/
+}
+
+#tray {
+}
+