diff --git a/i3/.config/i3/layouts/home-workspace1-comms.json b/i3/.config/i3/layouts/home-workspace1-comms.json
index fa25cc3..b3b2753 100644
--- a/i3/.config/i3/layouts/home-workspace1-comms.json
+++ b/i3/.config/i3/layouts/home-workspace1-comms.json
@@ -15,7 +15,7 @@
             "percent": 0.5,
             "swallows": [
                 {
-                    "class": "^URxvt$",
+                    "class": "^Gnome\\-terminal$",
                     "title": "^weechat$"
                 }
             ],
diff --git a/i3/.config/i3/layouts/laptop-workspace1-comms.json b/i3/.config/i3/layouts/laptop-workspace1-comms.json
index 9249e50..4b1327c 100644
--- a/i3/.config/i3/layouts/laptop-workspace1-comms.json
+++ b/i3/.config/i3/layouts/laptop-workspace1-comms.json
@@ -12,7 +12,7 @@
     "percent": 0.5,
     "swallows": [
         {
-            "class": "^URxvt$",
+            "class": "^Gnome\\-terminal$",
             "title": "^weechat$"
         }
     ],
diff --git a/i3/.config/i3/layouts/work-workspace1-comms.json b/i3/.config/i3/layouts/work-workspace1-comms.json
index 132106a..dc775da 100644
--- a/i3/.config/i3/layouts/work-workspace1-comms.json
+++ b/i3/.config/i3/layouts/work-workspace1-comms.json
@@ -12,7 +12,7 @@
     "percent": 0.5,
     "swallows": [
         {
-            "class": "^URxvt$",
+            "class": "^Gnome\\-terminal$",
             "title": "^weechat$"
         }
     ],
diff --git a/i3/.config/i3/scripts/home-layout.sh b/i3/.config/i3/scripts/home-layout.sh
index be513e2..39cd885 100755
--- a/i3/.config/i3/scripts/home-layout.sh
+++ b/i3/.config/i3/scripts/home-layout.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 i3-msg 'workspace "1: Comms"; append_layout ~/.config/i3/layouts/home-workspace1-comms.json'
-i3-msg 'workspace "1: Comms"; exec urxvt -title weechat -e weechat'
+i3-msg 'workspace "1: Comms"; exec gnome-terminal --profile weechat -e weechat'
 i3-msg 'workspace "1: Comms"; move workspace to output DP-2-2'
 
 i3-msg 'workspace "2: Web"; append_layout ~/.config/i3/layouts/home-workspace2-web.json'
diff --git a/i3/.config/i3/scripts/laptop-layout.sh b/i3/.config/i3/scripts/laptop-layout.sh
index 06571eb..03d4efd 100755
--- a/i3/.config/i3/scripts/laptop-layout.sh
+++ b/i3/.config/i3/scripts/laptop-layout.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 i3-msg 'workspace "1: Comms"; append_layout ~/.config/i3/layouts/laptop-workspace1-comms.json'
-i3-msg 'workspace "1: Comms"; exec urxvt -title weechat -e weechat'
+i3-msg 'workspace "1: Comms"; exec gnome-terminal --profile weechat -e weechat'
 i3-msg 'workspace "1: Comms"; move workspace to output eDP-1'
 
 i3-msg 'workspace "2: Web"; append_layout ~/.config/i3/layouts/laptop-workspace2-web.json'
diff --git a/i3/.config/i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh
index f682291..a46b2e7 100755
--- a/i3/.config/i3/scripts/work-layout.sh
+++ b/i3/.config/i3/scripts/work-layout.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 i3-msg 'workspace "1: Comms"; append_layout ~/.config/i3/layouts/work-workspace1-comms.json'
-i3-msg 'workspace "1: Comms"; exec urxvt -title weechat -e weechat'
+i3-msg 'workspace "1: Comms"; exec gnome-terminal --profile weechat -e weechat'
 i3-msg 'workspace "1: Comms"; move workspace to output DP-2-1'
 sleep 2
 
diff --git a/polybar/.config/polybar/laptop-config b/polybar/.config/polybar/laptop-config
index 39385e6..7b4262b 100644
--- a/polybar/.config/polybar/laptop-config
+++ b/polybar/.config/polybar/laptop-config
@@ -32,9 +32,11 @@ monitor = eDP-1
 width = 100%
 height = 30
 offset-x = 0
+;offset-right-x = 15
 offset-y = 0
 padding-right = 7
 padding-left = 7
+fixed-center = true
 
 underline-size = 3
 underline-color = ${colors.visible-foreground}
diff --git a/urxvt/.Xdefaults b/urxvt/.Xdefaults
index ecc7f55..2bce83e 100644
--- a/urxvt/.Xdefaults
+++ b/urxvt/.Xdefaults
@@ -1,13 +1,22 @@
+URxvt.termName: rxvt-unicode-256color
+
 URxvt.background: #263238
 URxvt.foreground: grey80
-URxvt.letterSpace: -1
+
 URxvt.scrollBar: false
 URxvt.internalBorder:  10
 
-URxvt.font: xft:Roboto Mono for Powerline:size=12,xft:Roboto Mono:size=12
+URxvt.font: xft:Roboto Mono for Powerline:size=12,\
+			xft:Roboto Mono:size=12,\
+            xft:Noto Color Emoji:Regular:size=8
+
 URxvt.boldFont: xft:Roboto Mono for Powerline:bold:size=12,xft:Roboto Mono:bold:size=12
 URxvt.italicFont: xft:Roboto Mono for Powerline:italic:size=12,xft:Roboto Mono:italic:size=12
 URxvt.bolditalicFont: xft:Roboto Mono for Powerline:bold:italic:size=12, xft:Roboto Mono:bold:italic:size=12
 
+URxvt.letterSpace: -1
+URxvt.antialias: 1
+
+
 URxvt*color1: #009688
 URxvt*color2: #263238