diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 295d499..c5c1c2e 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -4,7 +4,7 @@
 	"modules-left": [
 		"sway/workspaces"
 	],
-	"modules-right": ["pulseaudio", "backlight", "network",  "cpu", "memory", "disk", "temperature", "battery", "clock", "tray"],
+	"modules-right": ["pulseaudio", "custom/wireguard", "backlight", "network",  "cpu", "memory", "disk", "temperature", "battery", "clock", "tray"],
 	"cpu": {
 		"format": "CPU: {usage}%"
 	},
@@ -23,5 +23,10 @@
 	},
 	"disk": {
 		"format": "{free}"
-	}
+	},
+  "custom/wireguard": {
+    "exec": "~/.config/waybar/scripts/wireguard.sh",
+    "on-click": "~/.config/waybar/scripts/wireguard.sh --toggle",
+    "interval": 2
+  }
 }
diff --git a/waybar/.config/waybar/configs/gb-mnc-wg-005-2.conf b/waybar/.config/waybar/configs/gb-mnc-wg-005-2.conf
new file mode 100644
index 0000000..0b933c2
--- /dev/null
+++ b/waybar/.config/waybar/configs/gb-mnc-wg-005-2.conf
@@ -0,0 +1,10 @@
+[Interface]
+# Device: Pure Clam
+PrivateKey = EKuFKkMBtSWlqY6ZwcljY5BFZCtahYkhb8y3jLtwxVo=
+Address = 10.64.206.238/32,fc00:bbbb:bbbb:bb01::1:ceed/128
+DNS = 100.64.0.7
+
+[Peer]
+PublicKey = kbVlSaqHQSpnewQn1X0j5R+WKiSW2e2Gq+I4XZj3Bjk=
+AllowedIPs = 0.0.0.0/0,::0/0
+Endpoint = 146.70.132.226:51820
\ No newline at end of file
diff --git a/waybar/.config/waybar/scripts/wireguard.sh b/waybar/.config/waybar/scripts/wireguard.sh
new file mode 100755
index 0000000..5763e33
--- /dev/null
+++ b/waybar/.config/waybar/scripts/wireguard.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+connection_status() {
+    if [ -f "$config" ]; then
+        connection=$(sudo wg show "$config_name" 2>/dev/null | head -n 1 | awk '{print $NF }')
+
+        if [ "$connection" = "$config_name" ]; then
+            echo "1"
+        else
+            echo "2"
+        fi
+    else
+        echo "3"
+    fi
+}
+
+config="/home/matt/.config/waybar/configs/gb-mnc-wg-005-2.conf"
+config_name=$(basename "${config%.*}")
+
+case "$1" in
+--toggle)
+    if [ "$(connection_status)" = "1" ]; then
+        sudo wg-quick down "$config" 2>/dev/null
+    else
+        sudo wg-quick up "$config" 2>/dev/null
+    fi
+    ;;
+*)
+    if [ "$(connection_status)" = "1" ]; then
+        echo "VPN: On"
+    elif [ "$(connection_status)" = "3" ]; then
+        echo "Config not found!"
+    else
+        echo "VPN: Off"
+    fi
+    ;;
+esac
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
new file mode 100644
index 0000000..6c05acc
--- /dev/null
+++ b/waybar/.config/waybar/style.css
@@ -0,0 +1,332 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+}
+
+window#waybar {
+    background-color: rgba(43, 48, 59, 0.5);
+    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: #a37800;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+}
+
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#workspaces button.focused {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#power-profiles-daemon,
+#mpd {
+    padding: 0 10px;
+    color: #ffffff;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#clock {
+    background-color: #64727D;
+}
+
+#battery {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+/* Using steps() instead of linear as a timing function to limit cpu usage */
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: steps(12);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
+#power-profiles-daemon.performance {
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    background-color: #2980b9;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#disk {
+    background-color: #964B00;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#wireplumber {
+    background-color: #fff0f5;
+    color: #000000;
+}
+
+#wireplumber.muted {
+    background-color: #f53c3c;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    padding: 0 5px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    padding: 0 0px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
+
+#privacy {
+    padding: 0;
+}
+
+#privacy-item {
+    padding: 0 5px;
+    color: white;
+}
+
+#privacy-item.screenshare {
+    background-color: #cf5700;
+}
+
+#privacy-item.audio-in {
+    background-color: #1ca000;
+}
+
+#privacy-item.audio-out {
+    background-color: #0069d4;
+}
+
+#custom-wireguard {
+  background-color: #ffa000;
+  color: black;
+}