diff --git a/config.h b/config.h
index 0f8f8e5..3bb9c3c 100644
--- a/config.h
+++ b/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-//#define TAPPING_FORCE_HOLD
+// #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 200
 #define TAPPING_TOGGLE 2
 
diff --git a/keymap.c b/keymap.c
index 26da021..03a38d6 100644
--- a/keymap.c
+++ b/keymap.c
@@ -38,7 +38,7 @@ enum {
     TD_BSLS
 };
 
-bool isWindows = true;
+bool isWindows = false; // Change to make default config Windows
 
 void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
@@ -283,46 +283,33 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     for (uint8_t i = led_min; i <= led_max; i++) {
         switch(get_highest_layer(layer_state|default_layer_state)) {
           case 1:
-            rgb_matrix_set_color(i, RGB_GREEN);
+            if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
+              rgb_matrix_set_color(i, RGB_CHARTREUSE);
+            }
             break;
           case 2:
-            rgb_matrix_set_color(i, RGB_RED);
+            if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
+              rgb_matrix_set_color(i, RGB_ORANGE);
+            }
             break;
           case 3:
-            rgb_matrix_set_color(i, RGB_BLUE);
+            if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
+              rgb_matrix_set_color(i, RGB_CYAN);
+            }
+            break;
+          case 4:
+            if((i == 6) || (i >= 13 && i <= 14) || (i >= 40 && i <= 41) || (i == 33)){
+              rgb_matrix_set_color(i, RGB_AZURE);
+            }
             break;
           default:
-            if (isWindows == false){
-              rgb_matrix_set_color(26, RGB_GREEN);
+            if (isWindows == true){ // Change to false if main config is Mac
+              rgb_matrix_set_color(26, RGB_WHITE);
             }
             if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-              rgb_matrix_set_color(53, RGB_GREEN);
+              rgb_matrix_set_color(53, RGB_WHITE);
             }
             break;
         }
     }
 }
-
-/* void rgb_matrix_indicators_user(void) {
-  #ifdef RGB_MATRIX_ENABLE
-  switch (biton32(layer_state)) {
-    case 1:
-      rgb_matrix_set_color_all(RGB_GREEN);
-      break;
-    case 2:
-      rgb_matrix_set_color_all(RGB_RED);
-      break;
-    case 3:
-      rgb_matrix_set_color_all(RGB_BLUE);
-      break;
-    default:
-      if (isWindows == false){
-        rgb_matrix_set_color(26, RGB_RED);
-      }
-      if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-        rgb_matrix_set_color(53, RGB_RED);
-      }
-      break;
-  }
-  #endif
-} */
diff --git a/rules.mk b/rules.mk
index 2cee0c6..70225f2 100644
--- a/rules.mk
+++ b/rules.mk
@@ -5,5 +5,5 @@ RGB_MATRIX_ENABLE = yes
 OLED_ENABLE     = yes
 OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
-TAP_DANCE_ENABLE = yes  
+TAP_DANCE_ENABLE = yes
 SEND_STRING_ENABLE = yes
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 282895a..0c89fc9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.0.3
\ No newline at end of file
+4.0.0
\ No newline at end of file