diff --git a/hypr/frappe.conf b/hypr/frappe.conf
new file mode 100644
index 0000000..97dff8e
--- /dev/null
+++ b/hypr/frappe.conf
@@ -0,0 +1,61 @@
+$rosewaterAlpha = f2d5cf
+$flamingoAlpha  = eebebe
+$pinkAlpha      = f4b8e4
+$mauveAlpha     = ca9ee6
+$redAlpha       = e78284
+$maroonAlpha    = ea999c
+$peachAlpha     = ef9f76
+$yellowAlpha    = e5c890
+$greenAlpha     = a6d189
+$tealAlpha      = 81c8be
+$skyAlpha       = 99d1db
+$sapphireAlpha  = 85c1dc
+$blueAlpha      = 8caaee
+$lavenderAlpha  = babbf1
+
+$textAlpha      = c6d0f5
+$subtext1Alpha  = b5bfe2
+$subtext0Alpha  = a5adce
+
+$overlay2Alpha  = 949cbb
+$overlay1Alpha  = 838ba7
+$overlay0Alpha  = 737994
+
+$surface2Alpha  = 626880
+$surface1Alpha  = 51576d
+$surface0Alpha  = 414559
+
+$baseAlpha      = 303446
+$mantleAlpha    = 292c3c
+$crustAlpha     = 232634
+
+$rosewater = 0xfff2d5cf
+$flamingo  = 0xffeebebe
+$pink      = 0xfff4b8e4
+$mauve     = 0xffca9ee6
+$red       = 0xffe78284
+$maroon    = 0xffea999c
+$peach     = 0xffef9f76
+$yellow    = 0xffe5c890
+$green     = 0xffa6d189
+$teal      = 0xff81c8be
+$sky       = 0xff99d1db
+$sapphire  = 0xff85c1dc
+$blue      = 0xff8caaee
+$lavender  = 0xffbabbf1
+
+$text      = 0xffc6d0f5
+$subtext1  = 0xffb5bfe2
+$subtext0  = 0xffa5adce
+
+$overlay2  = 0xff949cbb
+$overlay1  = 0xff838ba7
+$overlay0  = 0xff737994
+
+$surface2  = 0xff626880
+$surface1  = 0xff51576d
+$surface0  = 0xff414559
+
+$base      = 0xff303446
+$mantle    = 0xff292c3c
+$crust     = 0xff232634
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 23a379f..0402ad4 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -2,7 +2,7 @@
 monitor=,highrr,auto,1.00
 
 # Startup
-exec-once = waybar -c ~/.config/waybar/config.json
+exec-once = waybar -c ~/.config/waybar/config
 exec-once = pulseaudio
 exec-once = syncthing --no-browser
 exec-once = dunst
@@ -25,6 +25,12 @@ input {
     sensitivity = 0 
 }
 
+# Disable touchscreen
+device {
+    name = gxtp7386:00-27c6:011a
+    enabled = false
+}
+
 
 dwindle {
     pseudotile = yes 
diff --git a/hypr/theme.conf b/hypr/theme.conf
index 20b8788..fc10491 100644
--- a/hypr/theme.conf
+++ b/hypr/theme.conf
@@ -21,7 +21,7 @@ layerrule = blur,waybar
 
 
 # Window Customization
-source = ~/.config/hypr/latte.conf
+source = ~/.config/hypr/frappe.conf
 
 general {
     gaps_in = 0
diff --git a/waybar/config b/waybar/config
new file mode 100644
index 0000000..81d0823
--- /dev/null
+++ b/waybar/config
@@ -0,0 +1,142 @@
+[
+    {
+        "name": "main",
+        "layer": "top",
+        "position": "top",
+        "height": 38,
+        "spacing": 4,
+        "margin-top": 0,
+        "margin-bottom": 0,
+        "output": "eDP-1",
+        "reload_style_on_change": true,
+        "modules-left": [
+            "disk", 
+            "memory", 
+            "cpu", 
+            "temperature",
+            "pulseaudio"
+        ],
+        "modules-center": ["hyprland/workspaces"],
+        "modules-right": [
+            "tray", 
+            "network#wifi", 
+            "custom/weather", 
+            "battery",
+            "clock",
+            "custom/poweroff"
+        ],
+        "battery": {
+            "interval": 20,
+            "states": {
+                "warning": 30,
+                "critical": 15
+            },
+            "format": "{icon} {capacity}%",
+            "format-icons": [" ", " ", " ", " ", " "],
+            "max-length": 25
+        },
+        "clock": {
+            "interval": 1,
+            "format": "<b>{:%I:%M:%S %p}</b>",
+            "format-alt": "{:%Y-%m-%d}",
+            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+        },
+        "cpu": {
+            "format": " {usage}%",
+            "tooltip": false
+        },
+        "disk": {
+            "format": " {}%",
+            "tooltip-format": "{used} / {total} used"
+        },
+        "idle_inhibitor": {
+            "format": "{icon}",
+            "format-icons": {
+                "activated": "",
+                "deactivated": ""
+            }
+        },
+        "memory": {
+            "format": " {}%",
+            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
+        },
+        "temperature": {
+            "critical-threshold": 80,
+            "format": "{icon} {temperatureC}°C",
+            "format-icons": ["", "", "", "", ""],
+            "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input"
+        },
+        "network#wifi": {
+            "interface": "wlo1",
+            "format-wifi": " {signalStrength}%",
+            "format-disconnected": "",
+            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
+        },
+        "hyprland/workspaces": {
+            "format": "{icon}",
+            "sort-by-number": true,
+            "all-outputs": true,
+            "disable-scroll": true,
+            "active-only": false,
+            "format-icons": {
+                "default": "",
+                "persistent": "",
+                "active": ""
+            },
+            "persistent-workspaces": {
+                "1": [ ],
+                "2": [ ],
+                "3": [ ],
+                "4": [ ],
+                "5": [ ]
+            }
+        },
+        "wlr/taskbar": {
+            "format": "{name}",
+            "icon-size": 32,
+            "tooltip": false,
+            "on-click": "activate",
+            "on-click-right": "close",
+            "all-outputs": true,
+            "ignore-list": [
+                "xwaylandvideobridge"
+            ],
+            "rewrite": {
+                "(.*)Firefox Web Browser": "",
+                "(.*)Discord": "󰙯",
+                "(.*)Alacritty": "",
+                "Steam(.*)": "",
+                "(.*)Spotify": ""
+            }
+        },
+        "pulseaudio": {
+            "format": " {volume}%",
+            "format-muted": " 0%",
+            "max-volume": 100,
+            "scroll-step": 0
+        },
+        "tray": {
+            "icon-size": 21,
+            "spacing": 10
+        },
+        "custom/spotify": {
+            "interval": 1,
+            "return-type": "json",
+            "exec": "~/.config/waybar/scripts/spotify.sh",
+            "exec-if": "pgrep spotify",
+            "escape": true
+        },
+        "custom/poweroff": {
+            "tooltip": false,
+            "format": " ",
+            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
+        },
+        "custom/weather": {
+            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
+            "return-type": "json",
+            "format": "{}",
+            "tooltip": true,
+            "interval": 3600
+        }
+    }
+]
diff --git a/waybar/frappe.css b/waybar/frappe.css
new file mode 100644
index 0000000..18520fb
--- /dev/null
+++ b/waybar/frappe.css
@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Frappe palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #303446;
+@define-color mantle #292c3c;
+@define-color crust  #232634;
+
+@define-color text     #c6d0f5;
+@define-color subtext0 #a5adce;
+@define-color subtext1 #b5bfe2;
+
+@define-color surface0 #414559;
+@define-color surface1 #51576d;
+@define-color surface2 #626880;
+
+@define-color overlay0 #737994;
+@define-color overlay1 #838ba7;
+@define-color overlay2 #949cbb;
+
+@define-color blue      #8caaee;
+@define-color lavender  #babbf1;
+@define-color sapphire  #85c1dc;
+@define-color sky       #99d1db;
+@define-color teal      #81c8be;
+@define-color green     #a6d189;
+@define-color yellow    #e5c890;
+@define-color peach     #ef9f76;
+@define-color maroon    #ea999c;
+@define-color red       #e78284;
+@define-color mauve     #ca9ee6;
+@define-color pink      #f4b8e4;
+@define-color flamingo  #eebebe;
+@define-color rosewater #f2d5cf;
diff --git a/waybar/style.css b/waybar/style.css
index 6748cc5..d815be6 100755
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,4 +1,4 @@
-@import "latte.css";
+@import "frappe.css";
 
 * {
     border: none;
@@ -10,39 +10,30 @@
 }
 
 window#waybar {
-    background: transparent;
-	color: @peach;
-    /*border-bottom: 4px solid @crust;*/
+    background: alpha(@mantle, 0.6);
     border-radius: 0px;
-    padding: 4px;
 }
 
 window#waybar.hidden {
     opacity: 0.2;
 }
 
-#workspaces {
-    margin: 4px 0;
-    border-radius: 5px;
-    background: transparent;
-}
-
 #workspaces button {
-    color: @overlay0;
-    background: transparent;
+    color: @peach;
     transition: all 0.1s ease;
 }
 
 #workspaces button.active {
-    color: @peach;
-    border-top: 2px solid @peach;
+    background-color: alpha(@peach, 0.2);
+    border-radius: 2px;
     transition: all 0.1s ease;
 }
 
 .modules-left,
 .modules-center,
 .modules-right {
-    padding: 4px;
+    padding-top: 2px;
+    padding-bottom: 6px;
 }
 
 #battery,
@@ -57,38 +48,14 @@ window#waybar.hidden {
 #custom-poweroff,
 #custom-weather {
     background-color: @base;
-    border-radius: 6px;
+    border-radius: 10px;
+    border: 1px solid @overlay0;
     margin-left: 6px;
     margin-right: 6px;
-	padding: 0 10px;
+    color: @peach;
+    min-width: 60px;
 }
 
-/*
-#pulseaudio {
-	color: @sapphire;
+#clock {
+    min-width: 100px;
 }
-#disk {
-	color: @peach;
-}
-#memory {
-	color: @teal;
-}
-#cpu {
-	color: @lavender;
-}
-#temperature {
-    color: @sky;
-}
-*/
-
-
-
-
-#workspaces button.active {
-    background-color: alpha(@peach, 0.2);
-    border-radius: 2px;
-    margin-bottom: 2px;
-    transition: all 0.1s ease;
-}
-
-