diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index fccd51f..3eb5558 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,46 +1,45 @@
 {
   "LazyVim": { "branch": "main", "commit": "91fe7ef56815263b6a0f4a5c23c4bd1134c77849" },
-  "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
-  "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
+  "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
+  "catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
-  "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
-  "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
-  "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" },
-  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
-  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
-  "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
-  "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
-  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
-  "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" },
-  "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
-  "neoconf.nvim": { "branch": "main", "commit": "4e204e0d423e70293b81ba1655ed17e1f3c97986" },
-  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
-  "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" },
-  "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-snippets": { "branch": "main", "commit": "67f44a552f03b5de23af1900d01af3256a3da2bc" },
-  "nvim-spectre": { "branch": "master", "commit": "5690ea46baf08bbc1623980012e14b6239ce582e" },
-  "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
-  "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "4c96370cf93e2ba287548da12d673442d0ffecc3" },
-  "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
-  "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" },
-  "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
-  "ts-comments.nvim": { "branch": "main", "commit": "f7ded340b4c6b317593b867838bf7ace354a67d4" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
-}
\ No newline at end of file
+  "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" },
+  "dashboard-nvim": { "branch": "master", "commit": "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14" },
+  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
+  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
+  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2d725fdd7fe4a612fa3171ca0a965f455d8dc325" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" },
+  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "neoconf.nvim": { "branch": "main", "commit": "610d93be4902db0fbf0fb5f79d59d9e06aed929b" },
+  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
+  "nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+  "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
+  "nvim-spectre": { "branch": "master", "commit": "08be31c104df3b4b049607694ebb2b6ced4f928b" },
+  "nvim-treesitter": { "branch": "master", "commit": "39016abc99853c3e9d70f1bec7e2fa661b9a81bf" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "tokyonight.nvim": { "branch": "main", "commit": "2e1daa1d164ad8cc3e99b44ca68e990888a66038" },
+  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
+  "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
+  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+}
diff --git a/sway/config b/sway/config
index 177559d..debc040 100644
--- a/sway/config
+++ b/sway/config
@@ -4,7 +4,12 @@
 #
 # Read `man 5 sway` for a complete reference.
 
+exec waybar
 exec copyq --start-server
+exec wlsunset -l 37.9989 -L 145.1744 #Melbourne
+exec swaync
+exec joplin-desktop --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform=wayland
+
 
 ### Variables
 #
@@ -29,12 +34,12 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
-output eDP-1 resolution 1920x1080 position 0,0
-output eDP-1 scale 1.25
+output eDP-1 {
+    resolution 1920x1080
+    position 0,0
+    scale 1.25
+  } 
 
-set $display1 "AU Optronics 0x522D Unknown"
-set $display1-touch "1386:18576:Wacom_HID_4890_Finger"
-input $display1-touch map_to_output $display1
 #
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 
@@ -51,19 +56,19 @@ input $display1-touch map_to_output $display1
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 
-### Input configuration
-#
-# Example configuration:
-#
+### Input
 input type:touchpad {
 	tap enabled
+  scroll_factor 0.3
 }
 
 bindgesture swipe:right workspace next
 bindgesture swipe:left workspace prev
 
-input type:keyboard repeat_delay 200
-input type:keyboard repeat_rate 50
+input type:keyboard {
+    repeat_delay 200
+    repeat_rate 50
+  }
 
 #
 # You can get the names of your inputs by running: swaymsg -t get_inputs
@@ -82,6 +87,14 @@ input type:keyboard repeat_rate 50
     # Start your launcher
     bindsym $mod+r exec $menu
 
+    bindsym $mod+e exec "dolphin"
+
+    bindsym $mod+Shift+n exec swaync-client -t -sw
+
+    bindsym $mod+Shift+w exec "pkill waybar && waybar -c /home/harija/.config/waybar/elitebook/config -s /home/harija/.config/waybar/elitebook/style.css"
+
+    titlebar_padding 1
+
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
     # Despite the name, also works for non-floating windows.
@@ -145,6 +158,24 @@ input type:keyboard repeat_rate 50
     bindsym $mod+Shift+0 move container to workspace number 10
     # Note: workspaces can have any name you want, not just numbers.
     # We just use 1-10 as the default.
+
+
+
+#FN Hotkeys
+bindsym XF86RotateWindows exec layoutmsg orientationnext
+bindsym XF86AudioMute exec pamixer -t
+bindsym XF86AudioRaiseVolume exec pamixer -i 2
+bindsym XF86AudioLowerVolume exec pamixer -d 2
+bindsym XF86AudioMicMute exec pactl set-source-mute 2 toggle && notify-send "Mic Toggled"
+bindsym XF86MonBrightnessUp exec brightnessctl s 5%+
+bindsym  XF86MonBrightnessDown exec brightnessctl s 5%-
+bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+bindsym XF86AudioStop exec playerctl stop
+
+
+
 #
 # Layout stuff:
 #
@@ -157,7 +188,7 @@ input type:keyboard repeat_rate 50
     # Switch the current container between different layout styles
     bindsym $mod+s layout stacking
     bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
+    bindsym $mod+tab layout toggle split
 
     # Make the current focus fullscreen
     bindsym $mod+f fullscreen
@@ -205,24 +236,7 @@ mode "resize" {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-bindsym $mod+tab mode "resize"
+bindsym $mod+z mode "resize"
 
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
-
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %X'; do sleep 1; done
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
 
 include /etc/sway/config.d/*
diff --git a/waybar/elitebook/config b/waybar/elitebook/config
new file mode 100644
index 0000000..5d15a87
--- /dev/null
+++ b/waybar/elitebook/config
@@ -0,0 +1,125 @@
+
+{
+    "layer": "top", // Waybar at top layer
+    "position": "bottom", // Waybar position (top|bottom|left|right)
+    //"height": 5, // Waybar height (to be removed for auto height)
+    //"width": 5, // Waybar width
+    "spacing": 8, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": ["memory", "cpu", "temperature", "upower"],
+    "modules-center": ["sway/workspaces"],
+    "modules-right": [ "tray", "pulseaudio","idle_inhibitor", "power-profiles-daemon", "backlight", "network",  "clock"],
+    //Modules configuration
+
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "all-outputs": true,
+        "format": "{name}"
+    },
+
+    "tray": {
+        "icon-size": 18,
+        "spacing": 6
+    },
+
+    "clock": {
+        "format": "{:%I:%M %p}",
+        "timezone": "Australia/Melbourne",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+                    "mode"          : "month",
+
+                    "mode-mon-col"  : 3,
+                    "weeks-pos"     : "right",
+                    "on-scroll"     : 1,
+                    "on-click-right": "mode",
+                    "format": {
+                            "months":     "<span color='#ffead3'><b>{}</b></span>",
+                            "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+                            "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+                            "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+                            "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+                            }
+                    },
+        "actions":  {
+                    "on-click-right": "mode",
+                    "on-click-forward": "tz_up",
+                    "on-click-backward": "tz_down",
+                    "on-scroll-up": "shift_up",
+                    "on-scroll-down": "shift_down"
+                    }
+    },
+
+    "temperature": {
+        "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon7/temp1_input",
+        "format": "Tmp:{temperatureC:3}°C",
+    },
+    "backlight": {
+        "format": "B/L:{percent:3}%",
+    },
+
+    "upower": {
+        "format": "Bat:{percentage:3}",
+        "tooltip-format": "{percentage} {time}",
+        "icon-size": 0,
+        "show-icon": false,
+        "hide-if-empty": true,
+        "tooltip": true,
+        "tooltip-spacing": 20
+    },
+
+    "network": {
+        "interval": 60,
+        "format": "Wired",
+        "format-wifi": "Wi-Fi",
+        "format-alt": "{essid}",
+        "tooltip-format": "Net:{essid} LAN IP: {ipaddr} Gateway: {gwaddr}",
+        "format-linked": "{ifname} (No IP)",
+        "format-disconnected": "Dscnt",
+    },
+
+    "pulseaudio": {
+        "scroll-step": 1, // %, can be a float
+        "on-click-right": "exec pavucontrol",
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+        "ignored-sinks": ["Easy Effects Sink"],
+        "format": "Vol:{volume:3}%",
+        "format-muted": "Vol:Mute"
+
+    },
+
+    "cpu": {
+    "interval": 1,
+    "format": "CPU:{usage:3}%",
+    "on-click": "exec kitty btop"
+    },
+
+    "memory": {
+    "interval": 5,
+    "format": "Mem:{avail:0.1f}GiB",
+    "on-click": "exec kitty btop"
+    },
+
+    "power-profiles-daemon": {
+    "format": "Pwr:{icon}",
+    "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+    "tooltip": true,
+    "format-icons": {
+    "default": "",
+    "performance": "Prf",
+    "balanced": "Bal",
+    "power-saver": "Eco"
+    }
+},
+
+    "idle_inhibitor": {
+    "format": "Idle:{icon}",
+    "format-icons": {
+        "activated": "Actv",
+        "deactivated": "Dact"
+    }
+    }
+
+}
+    
\ No newline at end of file
diff --git a/waybar/elitebook/style.css b/waybar/elitebook/style.css
new file mode 100644
index 0000000..0f298df
--- /dev/null
+++ b/waybar/elitebook/style.css
@@ -0,0 +1,82 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: NotoSansM Nerd Font;
+    font-weight: 600;
+}
+
+/* Waybar Window */
+window#waybar {
+    background: #285577;
+    color: #ffffff;
+}
+
+/* Global Buttons */
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    padding: 0px;
+    margin: 0px;
+    border-radius: 0px;
+}
+
+
+/* Workspace Selector */
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: rgba(255, 255, 255, 0.3);
+}
+
+#workspaces button:hover {
+    background: rgba(238, 238, 238, 0.2);
+}
+
+#workspaces button.active,
+#workspaces button.visible {
+    color: #ffffff;
+    border: solid 1px cyan;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+
+/* Clock */
+
+
+
+/* Status Segments */
+#window,
+#power-profiles-daemon,
+#idle_inhibitor,
+#network,
+#backlight,
+#pulseaudio,
+#temperature,
+#memory,
+#cpu,
+#upower,
+#clock,
+#tray {
+    padding-left: 15px;
+    color: #ffffff;
+    font-size: 15px;
+}
+
+#clock {
+    padding-right: 15px;
+}
+
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+
+
+