diff --git a/README.md b/README.md
index 4797788..e01ca9d 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ A customizable replacement for the built-in Pebble action bar.
 - Custom x/y positions
 - Legacy Pebble SDK 2.X-style preset
 ### Removed Features
+- Anything to do with back button overrides
 - Custom animations
-    - Use built-in presets
-        - Move up/down/left/right (same as stock)
 - Round style
     - Using a rectangular bar on a round watch saves space and IMO looks way better
 ### Pending Features
-- Custom icon x offset
+- Custom icon x offsets
 - Match move animation distance to stock per-platform
 - Match move animation duration to stock
+- Allow customizing move animations
 - Built-in haptics
 - Legacy (background invert) animations support
 - Teardown/destroy/deinit helper
diff --git a/src/c/neat_bar.c b/src/c/neat_bar.c
index 9c1225c..3a729a6 100644
--- a/src/c/neat_bar.c
+++ b/src/c/neat_bar.c
@@ -4,17 +4,17 @@
 #include "neat_bar.h"
 #include <pebble.h>
 
-#if PBL_PLATFORM_EMERY
-const int8_t ICON_X_OFFSET = 0;
-const uint16_t UP_Y = 45;
-const uint16_t SELECT_Y = 105;
-const uint16_t DOWN_Y = 165;
-#elif PBL_PLATFORM_GABBRO
+#if PBL_DISPLAY_WIDTH >= 260 && PBL_ROUND
 const int8_t ICON_X_OFFSET = -1;
 const uint16_t UP_Y = 80;
 const uint16_t SELECT_Y = 121;
 const uint16_t DOWN_Y = 162;
-#elif PBL_PLATFORM_CHALK
+#elif PBL_DISPLAY_WIDTH >= 200 && PBL_RECT
+const int8_t ICON_X_OFFSET = 0;
+const uint16_t UP_Y = 45;
+const uint16_t SELECT_Y = 105;
+const uint16_t DOWN_Y = 165;
+#elif PBL_DISPLAY_WIDTH >= 180 && PBL_ROUND
 const int8_t ICON_X_OFFSET = -1;
 const uint16_t UP_Y = 53;
 const uint16_t SELECT_Y = 81;