diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
index 59f9d6a..e62224f 100644
--- a/config/corneish_zen.conf
+++ b/config/corneish_zen.conf
@@ -7,16 +7,6 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 # Require passkey on pairing
 CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
 
-# Zen display tweaks
-CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
-# Stock status screen
-#CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
-#CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
-#CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
-# 8-bit status screen
-CONFIG_ZEN_STATUS_SCREEN_8BIT=y
-CONFIG_ZEN_STATUS_SCREEN_8BIT_HALF=y
-
 # Sleep timeout to 30 min
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
diff --git a/config/west.yml b/config/west.yml
index d3c473d..cec1b51 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -6,14 +6,14 @@ manifest:
       url-base: https://github.com/caksoylar
   projects:
     - name: zmk
-      remote: caksoylar
-      revision: caksoylar/zen-8bit
+      remote: zmkfirmware
+      revision: main
       import: app/west.yml
     - name: zmk-rgbled-widget
       remote: caksoylar
       revision: main
     - name: zmk-tri-state
       remote: caksoylar
-      revision: split-locality
+      revision: main
   self:
     path: config
diff --git a/config/zen-status-screen.md b/config/zen-status-screen.md
deleted file mode 100644
index fa6c3c3..0000000
--- a/config/zen-status-screen.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# 8-bit status screen for Corne-ish Zen
-
-![Picture of status screen](https://repository-images.githubusercontent.com/340512296/020f96b5-a5cd-4d94-939a-2f70d6075a18)
-
-## Output widget
-
-Ranks:
-- `J`/`Q`: BLE/peripheral paired & connected
-- ❗: paired but not connected
-- ❓: not paired, advertising
-- 🔌: USB output
-
-Suits:
-- ♠️: BLE profile 1/5
-- ♥️: BLE profile 2
-- ♦️: BLE profile 3
-- ♣️: BLE profile 4
-
-## Battery widget
-
-A few pixels at the top of the display covertly shows the battery level, using the length of the line starting from top left and stretching to the right.
-
-The pixel art is not original, it is a design that was adapted from the creator of the 8bit deck: <https://dribbble.com/shots/13915286-Pixel-Art-Playing-Cards-Mini-Deck>.