diff --git a/lib/tms9918.h b/lib/tms9918.h
index 6472538..a07edbc 100644
--- a/lib/tms9918.h
+++ b/lib/tms9918.h
@@ -44,7 +44,7 @@ const byte COLOR_DARK_YELLOW  = 0xA;
 const byte COLOR_LIGHT_YELLOW = 0xB;
 const byte COLOR_DARK_GREEN   = 0xC;
 const byte COLOR_MAGENTA      = 0xD;
-const byte COLOR_GRAY         = 0xE;
+const byte COLOR_GREY         = 0xE;
 const byte COLOR_WHITE        = 0xF;
 
 // macro for combining foreground and background into a single byte value
diff --git a/tetris/draw.h b/tetris/draw.h
index 4d32c33..ee848c3 100644
--- a/tetris/draw.h
+++ b/tetris/draw.h
@@ -13,7 +13,7 @@
 #define BG_LIGHT_YELLOW "\x1c\x0B"
 #define BG_DARK_GREEN   "\x1c\x0C"
 #define BG_MAGENTA      "\x1c\x0D"
-#define BG_GRAY         "\x1c\x0E"
+#define BG_GREY         "\x1c\x0E"
 #define BG_WHITE        "\x1c\x0F"
 
 #define FG_TRANSPARENT  "\x1b\x00"
@@ -30,7 +30,7 @@
 #define FG_LIGHT_YELLOW "\x1b\xB0"
 #define FG_DARK_GREEN   "\x1b\xC0"
 #define FG_MAGENTA      "\x1b\xD0"
-#define FG_GRAY         "\x1b\xE0"
+#define FG_GREY         "\x1b\xE0"
 #define FG_WHITE        "\x1b\xF0"
 
 
diff --git a/tetris/grboard.h b/tetris/grboard.h
index 609ce9f..b6f8358 100644
--- a/tetris/grboard.h
+++ b/tetris/grboard.h
@@ -7,7 +7,7 @@
 #define BOARD_CHAR_RIGHT 6
 
 #define CRUNCH_CHAR_1  13
-#define CRUNCH_COLOR_1 FG_BG(COLOR_BLACK, COLOR_GRAY)
+#define CRUNCH_COLOR_1 FG_BG(COLOR_BLACK, COLOR_GREY)
 
 #define CRUNCH_CHAR_2  32
 #define CRUNCH_COLOR_2 FG_BG(COLOR_BLACK, COLOR_BLACK)
@@ -110,7 +110,7 @@ void fillFrame(byte x, byte y, byte w, byte h, byte ch, byte color) {
 // draws the board
 void drawPlayground() {
    tms_set_color(COLOR_DARK_BLUE);
-   byte frame_color = FG_BG(COLOR_GRAY,COLOR_BLACK);
+   byte frame_color = FG_BG(COLOR_GREY,COLOR_BLACK);
    byte text_color  = FG_BG(COLOR_LIGHT_YELLOW,COLOR_BLACK);
 
    // draw tetris board
@@ -144,7 +144,7 @@ void drawPlayground() {
 // displays "game over" and waits for return key
 void gameOver() {
    byte color = FG_BG(COLOR_LIGHT_YELLOW, COLOR_BLACK);
-   byte frame_color = FG_BG(COLOR_GRAY,COLOR_BLACK);
+   byte frame_color = FG_BG(COLOR_GREY,COLOR_BLACK);
 
    byte y = (STARTBOARD_Y+BROWS)/2;
 
diff --git a/tetris/tetris.c b/tetris/tetris.c
index b2baf5d..5d18e5d 100644
--- a/tetris/tetris.c
+++ b/tetris/tetris.c
@@ -17,7 +17,6 @@
 // TODO: solve division by counter_factor
 // TODO: interrupt and wait_interrupt()
 // TODO: better choice of colors for tiles
-// TODO: better initial fill/cls
 
 //
 // TETRIS for Apple1 + TMS9918 video card by P-LAB
@@ -107,7 +106,7 @@ byte piece_chars[NUMPIECES+1] = {
    EMPTY_GR_CHAR // space
 };
 byte piece_colors[NUMPIECES+1] = {
-   FG_BG( COLOR_GRAY         , COLOR_WHITE       ),  // L (orange in the original tetris)
+   FG_BG( COLOR_GREY         , COLOR_WHITE       ),  // L (orange in the original tetris)
    FG_BG( COLOR_LIGHT_BLUE   , COLOR_DARK_BLUE   ),  // J
    FG_BG( COLOR_MAGENTA      , COLOR_WHITE       ),  // T
    FG_BG( COLOR_CYAN         , COLOR_LIGHT_BLUE  ),  // I