diff --git a/i3/i3status.conf b/i3/MGen-status.conf
similarity index 68%
rename from i3/i3status.conf
rename to i3/MGen-status.conf
index a8779ed..3f102d6 100644
--- a/i3/i3status.conf
+++ b/i3/MGen-status.conf
@@ -11,16 +11,15 @@ general {
     interval = 1
 }
 order += "disk /"
-order += "wireless wlp2s0"
-order += "ethernet enp1s0"
+order += "ethernet tun0"
+order += "ethernet enp2s0f0"
 order += "volume master"
-order += "battery 1"
 order += "tztime local"
-wireless wlp2s0 {
-    format_up = "%essid : %ip @ %quality"
-    format_down = "!W"
+ethernet tun0 {
+    format_up = "%ip"
+    format_down = "!T"
 }
-ethernet enp1s0 {
+ethernet enp2s0f0 {
     # if you use %speed, i3status requires root privileges
     format_up = "%ip (%speed)"
     format_down = "!E"
@@ -39,12 +38,6 @@ volume master {
   mixer = "Master"
   mixer_idx = 0
 }
-battery 1 {
-  #format = "%status %remaining %emptytime"
-  format = "%status %percentage"
-  path = "/sys/class/power_supply/BAT1/uevent"
-  low_threshold = 20
-}
 disk "/" {
     format = "%free"
 }
diff --git a/scripts/sync.sh b/scripts/sync.sh
index 9c0e237..2f5140e 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -89,14 +89,14 @@ while getopts ":hbsdpcw" VALUE "$@"; do
     ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc
     if [ "$(uname)" != "Darwin" ]; then
       if command -v trash 2>&1 >/dev/null; then
-        trash ~/.i3/config ~/.i3/run.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources
+        trash ~/.i3/{config,i3status.conf,run.sh} ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources
       else
-        rm ~/.i3/config ~/.i3/run.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources
+        rm ~/.i3/{config,i3status.conf,run.sh} ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources
       fi
       # Don't install these on Mac
       mkdir -p ~/.i3
       ln -s $ABSPATH/i3/config ~/.i3/config
-      ln -s $ABSPATH/i3/i3status.conf ~/.i3/i3status.conf 2>/dev/null
+      ln -s $ABSPATH/i3/$(hostname)-status.conf ~/.i3/i3status.conf 2>/dev/null
       ln -s $ABSPATH/i3/run.sh ~/.i3/run.sh
       ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap
       ln -s $ABSPATH/i3/xsession ~/.xsession