diff --git a/neat_bar b/neat_bar
index 1ec561c..7fc72e0 160000
--- a/neat_bar
+++ b/neat_bar
@@ -1 +1 @@
-Subproject commit 1ec561c3e1d1d891f225f9fae009b7a6d7189f95
+Subproject commit 7fc72e0b083e679135abe201a99969b8751e49fd
diff --git a/package.json b/package.json
index cb6cb24..facc37f 100644
--- a/package.json
+++ b/package.json
@@ -66,10 +66,10 @@
         "sdkVersion": "3",
         "targetPlatforms": [
             "basalt",
-            "diorite",
             "chalk",
-            "flint",
+            "diorite",
             "emery",
+            "flint",
             "gabbro"
         ],
         "uuid": "3097b48e-552c-4a78-92b2-566b9128640e",
diff --git a/resources/logo_25~bw.png b/resources/logo_25~bw.png
index 2be3397..73ae1c6 100644
Binary files a/resources/logo_25~bw.png and b/resources/logo_25~bw.png differ
diff --git a/resources/next~bw.png b/resources/next~bw.png
new file mode 100644
index 0000000..ec2e2d5
Binary files /dev/null and b/resources/next~bw.png differ
diff --git a/resources/next.png b/resources/next~color.png
similarity index 100%
rename from resources/next.png
rename to resources/next~color.png
diff --git a/resources/pin~bw.png b/resources/pin~bw.png
new file mode 100644
index 0000000..ada1682
Binary files /dev/null and b/resources/pin~bw.png differ
diff --git a/resources/pin.png b/resources/pin~color.png
similarity index 100%
rename from resources/pin.png
rename to resources/pin~color.png
diff --git a/resources/prev~bw.png b/resources/prev~bw.png
new file mode 100644
index 0000000..44523e9
Binary files /dev/null and b/resources/prev~bw.png differ
diff --git a/resources/prev.png b/resources/prev~color.png
similarity index 100%
rename from resources/prev.png
rename to resources/prev~color.png
diff --git a/src/c/main.c b/src/c/main.c
index d2e8dee..ff7b700 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -190,7 +190,9 @@ static void main_window_load(Window *window) {
 	// sleep bar and icon
 	s_sleep_bar_layer = layer_create(s_sleep_bar_start);
 	s_logo_layer = bitmap_layer_create(s_logo_start);
+#if PBL_COLOR
 	bitmap_layer_set_compositing_mode(s_logo_layer, GCompOpSet);
+#endif
 	bitmap_layer_set_bitmap(s_logo_layer, s_logo_icon);
 
 	s_last_watched_layer = text_layer_create(GRect(MARGIN, 0, PBL_DISPLAY_WIDTH - (2 * MARGIN) - NEAT_BAR_WIDTH - PBL_IF_ROUND_ELSE(0, MARGIN / 2), s_available_height)); // y position updated when layer is written to