diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml
index 00c9b2d..697194e 100644
--- a/dot_config/alacritty/alacritty.yml
+++ b/dot_config/alacritty/alacritty.yml
@@ -61,13 +61,13 @@ window:
   # Values for `decorations` (macOS only):
   #     - transparent: Title bar, transparent background and title bar buttons
   #     - buttonless: Title bar, transparent background and no title bar buttons
-  decorations: none
+  decorations: "None"
 
   # Background opacity
   #
   # Window opacity as a floating point number from `0.0` to `1.0`.
   # The value `0.0` is completely transparent and `1.0` is opaque.
-  #opacity: 1.0
+  opacity: 1.0
 
   # Startup Mode (changes require restart)
   #
@@ -81,10 +81,10 @@ window:
   #startup_mode: Windowed
 
   # Window title
-  #title: Alacritty
+  title: Alacritty
 
   # Allow terminal applications to change Alacritty's window title.
-  #dynamic_title: true
+  dynamic_title: true
 
   # Window class (Linux/BSD only):
   #class:
@@ -118,7 +118,7 @@ font:
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
     #family: monospace
-    family: FiraCode Nerd Font
+    family: FiraCode Nerd Font Mono
 
     # The `style` can be specified to pick a specific face.
     style: Regular
@@ -130,7 +130,7 @@ font:
     # If the bold family is not specified, it will fall back to the
     # value specified for the normal font.
     #family: monospace
-    family: FiraCode Nerd Font
+    family: FiraCode Nerd Font Mono
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -142,7 +142,7 @@ font:
     # If the italic family is not specified, it will fall back to the
     # value specified for the normal font.
     #family: monospace
-    family: FiraCode Nerd Font
+    family: FiraCode Nerd Font Mono
 
     # The `style` can be specified to pick a specific face.
     style: Italic
@@ -154,7 +154,7 @@ font:
     # If the bold italic family is not specified, it will fall back to the
     # value specified for the normal font.
     #family: monospace
-    family: FiraCode Nerd Font
+    family: FiraCode Nerd Font Mono
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
@@ -192,6 +192,32 @@ font:
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false
 
+# Colors (Gruvbox Material Dark Medium)
+colors:
+  primary:
+    background: '0x282828'
+    foreground: '0xdfbf8e'
+
+  normal:
+    black:   '0x665c54'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xe78a4e'
+    blue:    '0x7daea3'
+    magenta: '0xd3869b'
+    cyan:    '0x89b482'
+    white:   '0xdfbf8e'
+
+  bright:
+    black:   '0x928374'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xe3a84e'
+    blue:    '0x7daea3'
+    magenta: '0xd3869b'
+    cyan:    '0x89b482'
+    white:   '0xdfbf8e'
+
 # Colors (Tomorrow Night)
 #colors:
   # Default colors
@@ -335,6 +361,8 @@ font:
   # the default background. When set to `true` all cells will be transparent
   # regardless of their background color.
   #transparent_background_colors: false
+  #
+
 
 # Bell
 #
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 974edd4..8cabad2 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -99,6 +99,7 @@
         "clock": {
             //"timezone": "America/New_York",
             "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+            "format": "{:%H:%M %d/%m/%Y}",
             "format-alt": "{:%Y-%m-%d}"
         },
         "cpu": {
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index 3094084..2d15cf0 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -150,9 +150,11 @@ label:focus {
 
 #pulseaudio {
   color: #fabd2f;
+  border-bottom: solid 3px #fabd2f;
 }
 #pulseaudio.muted {
   color: #d79921;
+  border-bottom: solid 3px #d79921;
 }
 
 #custom-media {
diff --git a/dot_config/waybar/style.scss b/dot_config/waybar/style.scss
index c87b080..e7183e7 100644
--- a/dot_config/waybar/style.scss
+++ b/dot_config/waybar/style.scss
@@ -174,9 +174,11 @@ label:focus {
 
 #pulseaudio {
     color: $light-yellow;
+    border-bottom: solid 3px $light-yellow;
 
     &.muted {
         color: $dark-yellow;
+        border-bottom: solid 3px $dark-yellow;
     }
 }
 
diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
index 9c3ee12..b07b5e4 100644
--- a/dot_doom.d/config.el
+++ b/dot_doom.d/config.el
@@ -38,7 +38,8 @@
 
 ;; Set font
 (setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
-      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
+      doom-unicode-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
+      doom-variable-pitch-font (font-spec :family "FiraCode Nerd Font Mono" :size 13))
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.