17 files changed, 186 insertions, 186 deletions

diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 98dcd5ff66..676d8fe169 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -309,8 +309,8 @@ static int scrollit(void)
         for(i=0, yy=y, xx=x; i< LETTERS_ON_SCREEN; i++) {
             letter = rock[(i+textpos) % rocklen ];
 
-            rb->lcd_bitmap((char *)char_gen_12x16[letter-0x20],
-                           xx, table[yy&(TABLE_SIZE-1)], 11, 16);
+            rb->lcd_mono_bitmap((char *)char_gen_12x16[letter-0x20],
+                                xx, table[yy&(TABLE_SIZE-1)], 11, 16);
             yy += YADD;
             xx+= LCD_WIDTH/LETTERS_ON_SCREEN;
         }
@@ -399,9 +399,9 @@ static int loopit(void)
         for(i=0, yy=y, xx=x;
             i<rocklen;
             i++, yy+=values[NUM_YDIST].num, xx+=values[NUM_XDIST].num)
-            rb->lcd_bitmap((char *)char_gen_12x16[rock[i]-0x20],
-                           xtable[xx&(TABLE_SIZE-1)], table[yy&(TABLE_SIZE-1)],
-                           11, 16);
+            rb->lcd_mono_bitmap((char *)char_gen_12x16[rock[i]-0x20],
+                                xtable[xx&(TABLE_SIZE-1)],
+                                table[yy&(TABLE_SIZE-1)], 11, 16);
         rb->lcd_update();
         rb->lcd_set_drawmode(DRMODE_SOLID);
 
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 1c394df9de..d81b71ee44 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -215,7 +215,7 @@ static void show_pause_mode(bool enabled)
     static const char pause_icon[] = {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00};
     
     if (enabled)
-        rb->lcd_bitmap(pause_icon, 52, 0, 7, 8);
+        rb->lcd_mono_bitmap(pause_icon, 52, 0, 7, 8);
     else
     {
         rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index fab5eab102..e990742c9f 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1062,7 +1062,7 @@ static void chip8_update_display(void)
     }
 #ifdef SIMULATOR
     rb->lcd_set_drawmode(DRMODE_SOLID);
-    rb->lcd_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT);
+    rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT);
     rb->lcd_update();
 #else
     rb->lcd_blit(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH, CHIP8_HEIGHT>>3
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index bddda15f5f..6830c74d53 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -788,9 +788,9 @@ bool colon, bool lcd)
         if(settings.digital_12h)
         {
             if(hour > 12)
-                rb->lcd_bitmap(pm, 97, 55, 15, 8);
+                rb->lcd_mono_bitmap(pm, 97, 55, 15, 8);
             else
-                rb->lcd_bitmap(am, 1, 55, 15, 8);
+                rb->lcd_mono_bitmap(am, 1, 55, 15, 8);
         }
     }
     else
@@ -798,9 +798,9 @@ bool colon, bool lcd)
         if(settings.lcd_12h)
         {
             if(hour > 12)
-                rb->lcd_bitmap(pm, 97, 55, 15, 8);
+                rb->lcd_mono_bitmap(pm, 97, 55, 15, 8);
             else
-                rb->lcd_bitmap(am, 1, 55, 15, 8);
+                rb->lcd_mono_bitmap(am, 1, 55, 15, 8);
         }
     }
 
@@ -881,138 +881,138 @@ void binary(int hour, int minute, int second)
      *****/
     if(temphour >= 32)
     {
-        rb->lcd_bitmap(bitmap_1, 0, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 0, 1, 15, 20);
         temphour -= 32;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 0, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 0, 1, 15, 20);
     if(temphour >= 16)
     {
-        rb->lcd_bitmap(bitmap_1, 19, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 19, 1, 15, 20);
         temphour -= 16;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 19, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 19, 1, 15, 20);
     if(temphour >= 8)
     {
-        rb->lcd_bitmap(bitmap_1, 38, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 38, 1, 15, 20);
         temphour -= 8;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 38, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 38, 1, 15, 20);
     if(temphour >= 4)
     {
-        rb->lcd_bitmap(bitmap_1, 57, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 57, 1, 15, 20);
         temphour -= 4;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 57, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 57, 1, 15, 20);
     if(temphour >= 2)
     {
-        rb->lcd_bitmap(bitmap_1, 76, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 76, 1, 15, 20);
         temphour -= 2;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 76, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 76, 1, 15, 20);
     if(temphour >= 1)
     {
-        rb->lcd_bitmap(bitmap_1, 95, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 95, 1, 15, 20);
         temphour -= 1;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 95, 1, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 95, 1, 15, 20);
 
     /*********
      * MINUTES
      ********/
     if(tempmin >= 32)
     {
-        rb->lcd_bitmap(bitmap_1, 0, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 0, 21, 15, 20);
         tempmin -= 32;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 0, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 0, 21, 15, 20);
     if(tempmin >= 16)
     {
-        rb->lcd_bitmap(bitmap_1, 19, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 19, 21, 15, 20);
         tempmin -= 16;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 19, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 19, 21, 15, 20);
     if(tempmin >= 8)
     {
-        rb->lcd_bitmap(bitmap_1, 38, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 38, 21, 15, 20);
         tempmin -= 8;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 38, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 38, 21, 15, 20);
     if(tempmin >= 4)
     {
-        rb->lcd_bitmap(bitmap_1, 57, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 57, 21, 15, 20);
         tempmin -= 4;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 57, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 57, 21, 15, 20);
     if(tempmin >= 2)
     {
-        rb->lcd_bitmap(bitmap_1, 76, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 76, 21, 15, 20);
         tempmin -= 2;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 76, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 76, 21, 15, 20);
     if(tempmin >= 1)
     {
-        rb->lcd_bitmap(bitmap_1, 95, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 95, 21, 15, 20);
         tempmin -= 1;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 95, 21, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 95, 21, 15, 20);
 
     /*********
      * SECONDS
      ********/
     if(tempsec >= 32)
     {
-        rb->lcd_bitmap(bitmap_1, 0, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 0, 42, 15, 20);
         tempsec -= 32;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 0, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 0, 42, 15, 20);
     if(tempsec >= 16)
     {
-        rb->lcd_bitmap(bitmap_1, 19, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 19, 42, 15, 20);
         tempsec -= 16;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 19, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 19, 42, 15, 20);
     if(tempsec >= 8)
     {
-        rb->lcd_bitmap(bitmap_1, 38, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 38, 42, 15, 20);
         tempsec -= 8;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 38, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 38, 42, 15, 20);
     if(tempsec >= 4)
     {
-        rb->lcd_bitmap(bitmap_1, 57, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 57, 42, 15, 20);
         tempsec -= 4;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 57, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 57, 42, 15, 20);
     if(tempsec >= 2)
     {
-        rb->lcd_bitmap(bitmap_1, 76, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 76, 42, 15, 20);
         tempsec -= 2;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 76, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 76, 42, 15, 20);
     if(tempsec >= 1)
     {
-        rb->lcd_bitmap(bitmap_1, 95, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_1, 95, 42, 15, 20);
         tempsec -= 1;
     }
     else
-        rb->lcd_bitmap(bitmap_0, 95, 42, 15, 20);
+        rb->lcd_mono_bitmap(bitmap_0, 95, 42, 15, 20);
 
     rb->lcd_update();
 }
@@ -1039,7 +1039,7 @@ void show_logo(bool animate, bool show_clock_text)
             rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1);
             rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38);
             rb->lcd_set_drawmode(DRMODE_SOLID);
-            rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37);
+            rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37);
             if(show_clock_text)
                 rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf);
             rb->lcd_update();
@@ -1051,7 +1051,7 @@ void show_logo(bool animate, bool show_clock_text)
             rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1);
             rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38);
             rb->lcd_set_drawmode(DRMODE_SOLID);
-            rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37);
+            rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37);
             if(show_clock_text)
                 rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf);
             rb->lcd_update();
@@ -1063,7 +1063,7 @@ void show_logo(bool animate, bool show_clock_text)
             rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1);
             rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38);
             rb->lcd_set_drawmode(DRMODE_SOLID);
-            rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37);
+            rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37);
             if(show_clock_text)
                 rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf);
             rb->lcd_update();
@@ -1071,7 +1071,7 @@ void show_logo(bool animate, bool show_clock_text)
     }
     else /* don't animate, just show */
     {
-        rb->lcd_bitmap(clogo, 0, 10, 112, 37);
+        rb->lcd_mono_bitmap(clogo, 0, 10, 112, 37);
         if(show_clock_text)
             rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf);
         rb->lcd_update();
@@ -1094,7 +1094,7 @@ void exit_logo(void)
         rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
         rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1);
         rb->lcd_set_drawmode(DRMODE_SOLID);
-        rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37);
+        rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37);
         rb->lcd_update();
     }
 }
@@ -1511,9 +1511,9 @@ bool f1_screen(void)
 void draw_checkbox(bool setting, int x, int y)
 {
     if(setting) /* checkbox is on */
-        rb->lcd_bitmap(checkbox_full, x, y, 8, 6);
+        rb->lcd_mono_bitmap(checkbox_full, x, y, 8, 6);
     else /* checkbox is off */
-        rb->lcd_bitmap(checkbox_empty, x, y, 8, 6);
+        rb->lcd_mono_bitmap(checkbox_empty, x, y, 8, 6);
 }
 
 void draw_settings(void)
@@ -1544,18 +1544,18 @@ void draw_settings(void)
         draw_checkbox(settings.analog_digits, 1, 33);
 
         if(settings.analog_date == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6);
         else if(settings.analog_date == 1)
-            rb->lcd_bitmap(checkbox_half, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_half, 1, 41, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
         if(settings.analog_time == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 49, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 49, 8, 6);
         else if(settings.analog_time == 1)
-            rb->lcd_bitmap(checkbox_half, 1, 49, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_half, 1, 49, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 49, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 49, 8, 6);
 
         draw_checkbox(settings.analog_secondhand, 1, 57);
     }
@@ -1584,20 +1584,20 @@ void draw_settings(void)
 
         /* Draw checkboxes */
         if(settings.digital_date == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 33, 8, 6);
         else if(settings.digital_date == 1)
-            rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_half, 1, 33, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 33, 8, 6);
 
         if(settings.digital_seconds == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6);
         else if(settings.digital_seconds == 1)
-            rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6);
         else if(settings.digital_seconds == 2)
-            rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
         draw_checkbox(settings.digital_blinkcolon, 1, 49);
         draw_checkbox(settings.digital_12h, 1, 57);
@@ -1627,20 +1627,20 @@ void draw_settings(void)
 
         /* Draw checkboxes */
         if(settings.lcd_date == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 33, 8, 6);
         else if(settings.lcd_date == 1)
-            rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_half, 1, 33, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 33, 8, 6);
 
         if(settings.lcd_seconds == 0)
-            rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6);
         else if(settings.lcd_seconds == 1)
-            rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6);
         else if(settings.lcd_seconds == 2)
-            rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
         draw_checkbox(settings.lcd_blinkcolon, 1, 49);
         draw_checkbox(settings.lcd_12h, 1, 57);
@@ -2131,16 +2131,16 @@ void general_settings(void)
         rb->lcd_getstringsize(buf, &buf_w, &buf_h);
         rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 56, buf);
 
-        rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-        rb->lcd_bitmap(arrow, 1, 25, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
         draw_checkbox(settings.display_counter, 1, 33);
 
         if(settings.save_mode == 1)
-            rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6);
         else if(settings.save_mode == 2)
-            rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6);
         else
-            rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+            rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
         switch(cursorpos)
         {
@@ -2181,15 +2181,15 @@ void general_settings(void)
                                 rb->lcd_puts(2, 5, "Save: Automatic");
                             else
                                 rb->lcd_puts(2, 5, "Save: Manually");
-                            rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 25, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
                             draw_checkbox(settings.display_counter, 1, 33);
                             if(settings.save_mode == 1)
-                                rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6);
                             else if(settings.save_mode == 2)
-                                rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6);
                             else
-                                rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
                             cursor(0, cursor_y, 112, 8);
                             rb->lcd_update();
@@ -2218,15 +2218,15 @@ void general_settings(void)
                                 rb->lcd_puts(2, 5, "Save: Automatic");
                             else
                                 rb->lcd_puts(2, 5, "Save: Manually");
-                            rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 25, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
                             draw_checkbox(settings.display_counter, 1, 33);
                             if(settings.save_mode == 1)
-                                rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6);
                             else if(settings.save_mode == 2)
-                                rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6);
                             else
-                                rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6);
+                                rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6);
 
                             cursor(0, cursor_y, 112, 8);
                             rb->lcd_update();
@@ -2323,9 +2323,9 @@ void draw_extras(int year, int day, int month, int hour, int minute, int second)
             if(settings.analog_time == 2)
             {
                 if(current_time->tm_hour > 12) /* PM */
-                    rb->lcd_bitmap(pm, 96, 1, 15, 8);
+                    rb->lcd_mono_bitmap(pm, 96, 1, 15, 8);
                 else /* AM */
-                    rb->lcd_bitmap(am, 96, 1, 15, 8);
+                    rb->lcd_mono_bitmap(am, 96, 1, 15, 8);
             }
         }
 
@@ -2460,11 +2460,11 @@ void select_mode(void)
         rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel");
 
         /* draw an arrow next to all of them */
-        rb->lcd_bitmap(arrow, 1, 9, 8, 6);
-        rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-        rb->lcd_bitmap(arrow, 1, 25, 8, 6);
-        rb->lcd_bitmap(arrow, 1, 33, 8, 6);
-        rb->lcd_bitmap(arrow, 1, 41, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6);
+        rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6);
 
         /* draw line selector */
         switch(cursorpos)
@@ -2501,11 +2501,11 @@ void select_mode(void)
                             rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel");
 
                             /* draw an arrow next to all of them */
-                            rb->lcd_bitmap(arrow, 1, 9, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 25, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 33, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 41, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6);
 
                             cursor(0, cursor_y, 112, 8);
                             rb->lcd_update();
@@ -2535,11 +2535,11 @@ void select_mode(void)
                             rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel");
 
                             /* draw an arrow next to all of them */
-                            rb->lcd_bitmap(arrow, 1, 9, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 17, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 25, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 33, 8, 6);
-                            rb->lcd_bitmap(arrow, 1, 41, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6);
+                            rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6);
 
                             cursor(0, cursor_y, 112, 8);
                             rb->lcd_update();
@@ -2580,7 +2580,7 @@ void counter_finished(void)
         rb->lcd_clear_display();
 
         /* draw "TIME'S UP" text */
-        rb->lcd_bitmap(times_up, 0, xpos, 112, 50);
+        rb->lcd_mono_bitmap(times_up, 0, xpos, 112, 50);
 
         /* invert lcd */
         rb->lcd_set_drawmode(DRMODE_COMPLEMENT);
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index d8d8eeb2ec..36411c2978 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -72,9 +72,9 @@ static unsigned char cursor_pic[32] = {
 /* draw a spot at the coordinates (x,y), range of p is 0-19 */
 static void draw_spot(int p) {
     ptr = spot_pic[spots[p]];
-    rb->lcd_bitmap (ptr, (p%5)*16+1, (p/5)*16+1, 14, 8);
+    rb->lcd_mono_bitmap (ptr, (p%5)*16+1, (p/5)*16+1, 14, 8);
     ptr += 14;
-    rb->lcd_bitmap (ptr, (p%5)*16+1, (p/5)*16+9, 14, 6);
+    rb->lcd_mono_bitmap (ptr, (p%5)*16+1, (p/5)*16+9, 14, 6);
 }
 
 /* draw the cursor at the current cursor position */
@@ -84,9 +84,9 @@ static void draw_cursor(void) {
     j = (cursor_pos/5)*16;
     rb->lcd_set_drawmode(DRMODE_FG);
     ptr = cursor_pic;
-    rb->lcd_bitmap (ptr, i, j, 16, 8);
+    rb->lcd_mono_bitmap (ptr, i, j, 16, 8);
     ptr += 16;
-    rb->lcd_bitmap (ptr, i, j+8, 16, 8);
+    rb->lcd_mono_bitmap (ptr, i, j+8, 16, 8);
     rb->lcd_set_drawmode(DRMODE_SOLID);
 }
 
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 08e0266a75..ad8b8fd025 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -230,7 +230,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
     while (1) {
 #ifdef HAVE_LCD_BITMAP
         rb->lcd_clear_display();
-        rb->lcd_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
+        rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
 #ifdef REMOTE_LOGO
         rb->lcd_remote_clear_display();
         rb->lcd_remote_bitmap(REMOTE_LOGO,
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 907aaf71b3..aec9ba166b 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -381,7 +381,7 @@ int minesweeper(void)
                         rb->lcd_putsxy(j*8+1,i*8+1,"b");
                     } else if(minefield[i][j].neighbors){
                         rb->lcd_set_drawmode(DRMODE_FG);
-                        rb->lcd_bitmap(num[minefield[i][j].neighbors],j*8,i*8,8,8);
+                        rb->lcd_mono_bitmap(num[minefield[i][j].neighbors],j*8,i*8,8,8);
                         rb->lcd_set_drawmode(DRMODE_SOLID);
                     }
                 } else if(minefield[i][j].flag) {
diff --git a/apps/plugins/rockboy/lcd-gb.h b/apps/plugins/rockboy/lcd-gb.h
index 3a612887e5..0b863b6eea 100644
--- a/apps/plugins/rockboy/lcd-gb.h
+++ b/apps/plugins/rockboy/lcd-gb.h
@@ -16,7 +16,7 @@ struct scan
 {
         int bg[64];
         int wnd[64];
-#ifdef GRAYSCALE
+#if LCD_DEPTH == 2
         byte buf[4][256];
 #else
         byte buf[8][256];
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c
index 651c82286f..9a7ead798f 100644
--- a/apps/plugins/rockboy/lcd.c
+++ b/apps/plugins/rockboy/lcd.c
@@ -786,7 +786,7 @@ void lcd_refreshline(void)
         recolor(BUF+WX, 0x04, 160-WX);
     }
     spr_scan();
-#ifdef GRAYSCALE
+#if LCD_DEPTH == 2
     if (scanline_ind == 3)
 #else
     if (scanline_ind == 7)
@@ -800,7 +800,7 @@ void lcd_refreshline(void)
 #if LCD_HEIGHT == 64
     scanline_ind = (scanline_ind+1) % 8;
 #else
-#ifdef GRAYSCALE
+#if LCD_DEPTH == 2
     scanline_ind = (scanline_ind+1) % 4;
 #else
     scanline_ind = (scanline_ind+1) % 8;
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 45608b9f36..e8a4923eee 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -245,21 +245,21 @@ void vid_update(int scanline)
       scanline-=16;
     else if (fb.mode==2)
       scanline-=8;
-#ifdef GRAYSCALE
+#if LCD_DEPTH == 2
     scanline_remapped = scanline / 4;
 #else
     scanline_remapped = scanline / 8;
 #endif      
     frameb = rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH;
     while (cnt < 160) {
-#ifdef GRAYSCALE
+#if LCD_DEPTH == 2
         *(frameb++) = (scan.buf[0][cnt]&0x3) |
                       ((scan.buf[1][cnt]&0x3)<<2) |
                       ((scan.buf[2][cnt]&0x3)<<4) |
                       ((scan.buf[3][cnt]&0x3)<<6);
         cnt++;
     }
-    rb->lcd_update_rect(0, scanline & ~3, LCD_WIDTH, 4); //8);
+    rb->lcd_update_rect(0, scanline & ~3, LCD_WIDTH, 4);
 #else       
         register unsigned scrbyte = 0;
         if (scan.buf[0][cnt] & 0x02)  scrbyte |= 0x01;
@@ -274,7 +274,7 @@ void vid_update(int scanline)
         cnt++;
     }
     rb->lcd_update_rect(0, scanline & ~7, LCD_WIDTH, 8);
-#endif /* GRAYSCALE */
+#endif /* LCD_DEPTH */
 #endif /* LCD_HEIGHT */
 }
 
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 3b9fe01bc8..acd66a033a 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -149,7 +149,7 @@ static unsigned char picture[20][32] = {
 static void draw_spot(int p, int x, int y)
 {
     if (pic || p==20) {
-        rb->lcd_bitmap (picture[p-1], x, y, 16, 16);
+        rb->lcd_mono_bitmap (picture[p-1], x, y, 16, 16);
     } else {
         rb->lcd_drawrect(x, y, 16, 16);
         rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index e1f0c32a66..815867af56 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -625,11 +625,11 @@ void draw_apple( void )
     char pscore[5], counter[4];
 
     rb->lcd_set_drawmode(DRMODE_FG);
-    rb->lcd_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPHEIGHT_snakebmp);
+    rb->lcd_mono_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPHEIGHT_snakebmp);
     rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
     rb->lcd_fillrect(0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp);
     rb->lcd_set_drawmode(DRMODE_FG);
-    rb->lcd_bitmap(snakeupbmp,0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp);
+    rb->lcd_mono_bitmap(snakeupbmp,0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp);
     rb->lcd_set_drawmode(DRMODE_SOLID);
 
     rb->snprintf(counter,sizeof(counter),"%d",applecount);
@@ -1303,7 +1303,7 @@ void game_init(void)
 #if LCD_WIDTH >= 160 && LCD_HEIGHT >= 128
 
         rb->lcd_set_drawmode(DRMODE_FG);
-        rb->lcd_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPWIDTH_snakebmp);
+        rb->lcd_mono_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPWIDTH_snakebmp);
         rb->lcd_set_drawmode(DRMODE_SOLID);
 
         rb->snprintf(plevel,sizeof(plevel),"%d",level);
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 75c561427a..73ce386de9 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -118,8 +118,8 @@ static void snow_move(void)
             }
             if (particle_exists(i))
 #ifdef HAVE_LCD_BITMAP
-                rb->lcd_bitmap(flake,particles[i][0],particles[i][1],
-                               FLAKE_WIDTH,FLAKE_WIDTH);
+                rb->lcd_mono_bitmap(flake,particles[i][0],particles[i][1],
+                                    FLAKE_WIDTH,FLAKE_WIDTH);
 #else
                 pgfx_drawpixel(particles[i][0],particles[i][1]);
 #endif
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 880b5a0ad9..89cadc3592 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -902,8 +902,8 @@ int solitaire(void){
                 rb->lcd_set_drawmode(DRMODE_SOLID);
                 /* known card */
                 if(deck[c].known){
-                    rb->lcd_bitmap(numbers[deck[c].num], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1, j, 8, 8);
-                    rb->lcd_bitmap(colors[deck[c].color], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+7, j, 8, 8);
+                    rb->lcd_mono_bitmap(numbers[deck[c].num], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1, j, 8, 8);
+                    rb->lcd_mono_bitmap(colors[deck[c].color], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+7, j, 8, 8);
                 }
                 /* draw top line of the card */
                 rb->lcd_drawline(i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1,j,i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+CARD_WIDTH-1,j);
@@ -946,9 +946,9 @@ int solitaire(void){
                 }
             }
             if(c != NOT_A_CARD) {
-                rb->lcd_bitmap(numbers[deck[c].num], LCD_WIDTH2 - CARD_WIDTH+1, i*CARD_HEIGHT, 8, 8);
+                rb->lcd_mono_bitmap(numbers[deck[c].num], LCD_WIDTH2 - CARD_WIDTH+1, i*CARD_HEIGHT, 8, 8);
             }
-            rb->lcd_bitmap(colors[i], LCD_WIDTH2 - CARD_WIDTH+7, i*CARD_HEIGHT, 8, 8);
+            rb->lcd_mono_bitmap(colors[i], LCD_WIDTH2 - CARD_WIDTH+7, i*CARD_HEIGHT, 8, 8);
             /* draw a selected card */
             if(c != NOT_A_CARD) {
                 if(sel_card == c){
@@ -978,8 +978,8 @@ int solitaire(void){
              rb->lcd_drawline(LCD_WIDTH2,LCD_HEIGHT-CARD_HEIGHT,LCD_WIDTH2,LCD_HEIGHT-2);
 #endif
             if(cur_rem != NOT_A_CARD){
-                rb->lcd_bitmap(numbers[deck[cur_rem].num], LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT, 8, 8);
-                rb->lcd_bitmap(colors[deck[cur_rem].color], LCD_WIDTH2 - CARD_WIDTH+7, LCD_HEIGHT-CARD_HEIGHT, 8, 8);
+                rb->lcd_mono_bitmap(numbers[deck[cur_rem].num], LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT, 8, 8);
+                rb->lcd_mono_bitmap(colors[deck[cur_rem].color], LCD_WIDTH2 - CARD_WIDTH+7, LCD_HEIGHT-CARD_HEIGHT, 8, 8);
                 /* draw a selected card */
                 if(sel_card == cur_rem){
                     rb->lcd_drawrect(LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT,CARD_WIDTH-1, CARD_HEIGHT-1);
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index e6d8551d63..142590d9e8 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -260,18 +260,18 @@ static void update_icons(void)
     rb->lcd_set_drawmode(DRMODE_SOLID);
 
     /* The CUT icon */
-    rb->lcd_bitmap(CUT_BMP,
+    rb->lcd_mono_bitmap(CUT_BMP,
         LCD_WIDTH / 3 / 2 - BMPWIDTH / 2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT);
 
     /* The loop mode icon */
-    rb->lcd_bitmap(LOOP_BMP[splitedit_get_loop_mode()],
+    rb->lcd_mono_bitmap(LOOP_BMP[splitedit_get_loop_mode()],
         LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT);
 
 #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     /* The scale icon */
-    rb->lcd_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()],
+    rb->lcd_mono_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()],
         2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT);
 #else
@@ -279,7 +279,7 @@ static void update_icons(void)
         static int idx;
         if (idx < 0 || idx > 1) idx = 0;
         idx = 1 - idx;
-        rb->lcd_bitmap(SCALE_BMP[idx],
+        rb->lcd_mono_bitmap(SCALE_BMP[idx],
             2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
             BMPWIDTH, BMPHEIGHT);
     }
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 9b2e0bb010..9dd3659f52 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -485,11 +485,11 @@ static void star_display_board_info(void)
     rb->lcd_putsxy(0, label_offset_y, str_info);
 
     if (control == STAR_CONTROL_BALL)
-        rb->lcd_bitmap (ball_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE,
-                        STAR_TILE_SIZE);
+        rb->lcd_mono_bitmap (ball_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE,
+                             STAR_TILE_SIZE);
     else
-        rb->lcd_bitmap (block_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE,
-                        STAR_TILE_SIZE);
+        rb->lcd_mono_bitmap (block_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE,
+                             STAR_TILE_SIZE);
 
     rb->lcd_update_rect(0, label_offset_y, LCD_WIDTH, char_height);
 }
@@ -520,37 +520,37 @@ static int star_load_level(int current_level)
                     break;
 
                 case STAR_WALL:
-                    rb->lcd_bitmap (wall_bmp,
-                                    STAR_OFFSET_X + x * STAR_TILE_SIZE,
-                                    STAR_OFFSET_Y + y * STAR_TILE_SIZE,
-                                    STAR_TILE_SIZE, STAR_TILE_SIZE);
+                    rb->lcd_mono_bitmap (wall_bmp,
+                                         STAR_OFFSET_X + x * STAR_TILE_SIZE,
+                                         STAR_OFFSET_Y + y * STAR_TILE_SIZE,
+                                         STAR_TILE_SIZE, STAR_TILE_SIZE);
                     break;
 
                 case STAR_STAR:
-                    rb->lcd_bitmap (star_bmp,
-                                    STAR_OFFSET_X + x * STAR_TILE_SIZE,
-                                    STAR_OFFSET_Y + y * STAR_TILE_SIZE,
-                                    STAR_TILE_SIZE, STAR_TILE_SIZE);
+                    rb->lcd_mono_bitmap (star_bmp,
+                                         STAR_OFFSET_X + x * STAR_TILE_SIZE,
+                                         STAR_OFFSET_Y + y * STAR_TILE_SIZE,
+                                         STAR_TILE_SIZE, STAR_TILE_SIZE);
                     star_count++;
                     break;
 
                 case STAR_BALL:
                     ball_x = x;
                     ball_y = y;
-                    rb->lcd_bitmap (ball_bmp,
-                                    STAR_OFFSET_X + x * STAR_TILE_SIZE,
-                                    STAR_OFFSET_Y + y * STAR_TILE_SIZE,
-                                    STAR_TILE_SIZE, STAR_TILE_SIZE);
+                    rb->lcd_mono_bitmap (ball_bmp,
+                                         STAR_OFFSET_X + x * STAR_TILE_SIZE,
+                                         STAR_OFFSET_Y + y * STAR_TILE_SIZE,
+                                         STAR_TILE_SIZE, STAR_TILE_SIZE);
                     break;
 
 
                 case STAR_BLOCK:
                     block_x = x;
                     block_y = y;
-                    rb->lcd_bitmap (block_bmp,
-                                    STAR_OFFSET_X + x * STAR_TILE_SIZE,
-                                    STAR_OFFSET_Y + y * STAR_TILE_SIZE,
-                                    STAR_TILE_SIZE, STAR_TILE_SIZE);
+                    rb->lcd_mono_bitmap (block_bmp,
+                                         STAR_OFFSET_X + x * STAR_TILE_SIZE,
+                                         STAR_OFFSET_Y + y * STAR_TILE_SIZE,
+                                         STAR_TILE_SIZE, STAR_TILE_SIZE);
                     break;
             }
             ptr_tab++;
@@ -665,7 +665,7 @@ static int star_run_game(void)
             {
                 for (i = 0 ; i < 7 ; i++)
                 {
-                    rb->lcd_bitmap(
+                    rb->lcd_mono_bitmap(
                         ball_bmp,
                         STAR_OFFSET_X + ball_x * STAR_TILE_SIZE + move_x * i,
                         STAR_OFFSET_Y + ball_y * STAR_TILE_SIZE + move_y * i,
@@ -697,7 +697,7 @@ static int star_run_game(void)
             {
                 for (i = 0 ; i < 7 ; i++)
                 {
-                    rb->lcd_bitmap(
+                    rb->lcd_mono_bitmap(
                         block_bmp,
                         STAR_OFFSET_X + block_x * STAR_TILE_SIZE + move_x * i,
                         STAR_OFFSET_Y + block_y * STAR_TILE_SIZE + move_y * i,
@@ -766,8 +766,8 @@ static int star_menu(void)
         }
 
         move_y = 0;
-        rb->lcd_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]],
-                       2, menu_offset_y + menu_y * char_height, 7, 8);
+        rb->lcd_mono_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]],
+                            2, menu_offset_y + menu_y * char_height, 7, 8);
         rb->lcd_update_rect (2, menu_offset_y + menu_y * 8, 8, 8);
         rb->sleep(STAR_SLEEP);
         anim_state++;
@@ -842,8 +842,8 @@ static int star_menu(void)
             rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
             rb->lcd_fillrect (2, 30, 7, 4 * 8);
             rb->lcd_set_drawmode(DRMODE_FG);
-            rb->lcd_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]],
-                           2, menu_offset_y + menu_y * 8 + move_y * i, 7, 8);
+            rb->lcd_mono_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]],
+                                2, menu_offset_y + menu_y * 8 + move_y * i, 7, 8);
             rb->lcd_update_rect(2, 30, 8, 4 * 8);
             anim_state++;
             rb->sleep(STAR_SLEEP);
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index d54f86de06..c2db45ed88 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -278,54 +278,54 @@ void change_settings(void)
 }
 
 void draw_analog_minimeters(void) {
-    rb->lcd_bitmap(sound_speaker, 0, 12, 4, 8);
+    rb->lcd_mono_bitmap(sound_speaker, 0, 12, 4, 8);
     rb->lcd_set_drawmode(DRMODE_FG);
     if(5<left_needle_top_x)
-        rb->lcd_bitmap(sound_low_level, 5, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_low_level, 5, 12, 2, 8);
     if(12<left_needle_top_x)
-        rb->lcd_bitmap(sound_med_level, 7, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_med_level, 7, 12, 2, 8);
     if(24<left_needle_top_x)
-        rb->lcd_bitmap(sound_high_level, 9, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_high_level, 9, 12, 2, 8);
     if(40<left_needle_top_x)
-        rb->lcd_bitmap(sound_max_level, 12, 12, 3, 8);
+        rb->lcd_mono_bitmap(sound_max_level, 12, 12, 3, 8);
 
     rb->lcd_set_drawmode(DRMODE_SOLID);
-    rb->lcd_bitmap(sound_speaker, 54, 12, 4, 8);
+    rb->lcd_mono_bitmap(sound_speaker, 54, 12, 4, 8);
     rb->lcd_set_drawmode(DRMODE_FG);
     if(5<(right_needle_top_x-56))
-        rb->lcd_bitmap(sound_low_level, 59, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_low_level, 59, 12, 2, 8);
     if(12<(right_needle_top_x-56))
-        rb->lcd_bitmap(sound_med_level, 61, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_med_level, 61, 12, 2, 8);
     if(24<(right_needle_top_x-56))
-        rb->lcd_bitmap(sound_high_level, 63, 12, 2, 8);
+        rb->lcd_mono_bitmap(sound_high_level, 63, 12, 2, 8);
     if(40<(right_needle_top_x-56))
-        rb->lcd_bitmap(sound_max_level, 66, 12, 3, 8);
+        rb->lcd_mono_bitmap(sound_max_level, 66, 12, 3, 8);
     rb->lcd_set_drawmode(DRMODE_SOLID);
 }
 
 void draw_digital_minimeters(void) {
-    rb->lcd_bitmap(sound_speaker, 34, 24, 4, 8);
+    rb->lcd_mono_bitmap(sound_speaker, 34, 24, 4, 8);
     rb->lcd_set_drawmode(DRMODE_FG);
     if(1<num_left_leds)
-        rb->lcd_bitmap(sound_low_level, 39, 24, 2, 8);
+        rb->lcd_mono_bitmap(sound_low_level, 39, 24, 2, 8);
     if(2<num_left_leds)
-        rb->lcd_bitmap(sound_med_level, 41, 24, 2, 8);
+        rb->lcd_mono_bitmap(sound_med_level, 41, 24, 2, 8);
     if(5<num_left_leds)
-        rb->lcd_bitmap(sound_high_level, 43, 24, 2, 8);
+        rb->lcd_mono_bitmap(sound_high_level, 43, 24, 2, 8);
     if(8<num_left_leds)
-        rb->lcd_bitmap(sound_max_level, 46, 24, 3, 8);
+        rb->lcd_mono_bitmap(sound_max_level, 46, 24, 3, 8);
 
     rb->lcd_set_drawmode(DRMODE_SOLID);
-    rb->lcd_bitmap(sound_speaker, 34, 40, 4, 8);
+    rb->lcd_mono_bitmap(sound_speaker, 34, 40, 4, 8);
     rb->lcd_set_drawmode(DRMODE_FG);
     if(1<(num_right_leds))
-        rb->lcd_bitmap(sound_low_level, 39, 40, 2, 8);
+        rb->lcd_mono_bitmap(sound_low_level, 39, 40, 2, 8);
     if(2<(num_right_leds))
-        rb->lcd_bitmap(sound_med_level, 41, 40, 2, 8);
+        rb->lcd_mono_bitmap(sound_med_level, 41, 40, 2, 8);
     if(5<(num_right_leds))
-        rb->lcd_bitmap(sound_high_level, 43, 40, 2, 8);
+        rb->lcd_mono_bitmap(sound_high_level, 43, 40, 2, 8);
     if(8<(num_right_leds))
-        rb->lcd_bitmap(sound_max_level, 46, 40, 3, 8);
+        rb->lcd_mono_bitmap(sound_max_level, 46, 40, 3, 8);
     rb->lcd_set_drawmode(DRMODE_SOLID);
 }
 
@@ -359,8 +359,8 @@ void analog_meter(void) {
 
     /* Needle covers */
     rb->lcd_set_drawmode(DRMODE_FG);
-    rb->lcd_bitmap(needle_cover, 22, 59, 13, 5);
-    rb->lcd_bitmap(needle_cover, 78, 59, 13, 5);
+    rb->lcd_mono_bitmap(needle_cover, 22, 59, 13, 5);
+    rb->lcd_mono_bitmap(needle_cover, 78, 59, 13, 5);
     rb->lcd_set_drawmode(DRMODE_SOLID);
 
     /* Show Left/Right */
@@ -396,10 +396,10 @@ void digital_meter(void) {
     rb->lcd_set_drawmode(DRMODE_FG);
     /* LEDS */
     for(i=0; i<num_left_leds; i++)
-        rb->lcd_bitmap(led, i*9+2+i, 14, 9, 5);
+        rb->lcd_mono_bitmap(led, i*9+2+i, 14, 9, 5);
 
     for(i=0; i<num_right_leds; i++)
-        rb->lcd_bitmap(led, i*9+2+i, 52, 9, 5);
+        rb->lcd_mono_bitmap(led, i*9+2+i, 52, 9, 5);
 
     rb->lcd_set_drawmode(DRMODE_SOLID);