diff --git a/riostart-custom b/riostart-custom
index 7d0fb64..c6a2758 100755
--- a/riostart-custom
+++ b/riostart-custom
@@ -1,4 +1,6 @@
 #!/bin/rc
 
-# This is an ugly hack to calculate the screen dimensions
-window -minx 0 -maxx 0 -maxx 99999 -maxy 99999 -hide build-windows
+window -hide apply-theme
+
+# Arrange windows
+echo `{aux/zerotrunc </dev/screen} | awk -f $home/lib/scripts/build-windows.awk | rc