Merge branch 'master' into coderkun_neo2

1 files changed, 743 insertions, 335 deletions

diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 7ae269563f..cf7c67339d 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -1,7 +1,26 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
+/*
+Copyright 2017 Priyadi Iman Nurcahyo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#if defined(PRIYADI_PROMETHIUM)
+  #include "promethium.h"
+#elif defined(PRIYADI_PLANCK)
+  #include "planck.h"
+#else
+  #error "no keyboard defined"
+#endif
 
-#include "promethium.h"
 #include "action_layer.h"
 #ifdef AUDIO_ENABLE
   #include "audio.h"
@@ -10,51 +29,115 @@
 #include "eeconfig.h"
 #include "process_unicode.h"
 #include "quantum.h"
+#ifdef RGBSPS_ENABLE
 #include "rgbsps.h"
+#endif
+#ifdef PS2_MOUSE_ENABLE
 #include "ps2_mouse.h"
 #include "ps2.h"
+#endif
+#ifdef FAUXCLICKY_ENABLE
+#include "fauxclicky.h"
+#endif
+#include "outputselect.h"
+#include "led.h"
 #define COUNT(x) (sizeof (x) / sizeof (*(x)))
 
-// #define RGBLED_NUM 5
-// struct cRGB led[RGBLED_NUM];
+// Fillers to make layering clearer
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+#define G(x) LGUI(x)
+#define KC_WWWB KC_WWW_BACK
+#define KC_WWWF KC_WWW_FORWARD
+
+// hybrid right-alt & scroll lock (mapped to Compose in OS)
+#define C_RALT MT(MOD_RALT, KC_SLCK)
+
+// dual use right-shift & del key
+// #define C_RSFT MT(MOD_RSFT, KC_DEL)
+
+bool capslock = false;
+#ifdef DOUBLESPACE_LAYER_ENABLE
+bool lspace_active = false;
+bool rspace_active = false;
+bool lspace_emitted = false;
+bool rspace_emitted = false;
+bool space_layer_entered = false;
+#endif
 
+// glow
+enum glow_modes {
+  GLOW_NONE,
+  GLOW_MIN,
+  GLOW_FULL
+};
+uint8_t glow_mode = GLOW_MIN;
 
+void turn_off_capslock(void);
 extern keymap_config_t keymap_config;
 
+// layers, ordering is important!
 enum layers {
   _QWERTY,
+  _DVORAK,
   _COLEMAK,
   _WORKMAN,
-  _PUNC,
+  _NORMAN,
+  _DEFAULT_LAYER_MAX = _NORMAN,
+
+  _GREEKU,
+  _GREEKL,
+
   _NUM,
-  _FUNC,
+  _FUN,
+  _PUNC,
+
+  _EMPTY,
   _EMOJI,
   _GUI,
+  _SYS
 };
 
+// double-space layer
+#define _SPACE _GUI
+
 enum planck_keycodes {
   // layouts
   QWERTY = SAFE_RANGE,
+  DVORAK,
   COLEMAK,
   WORKMAN,
+  NORMAN,
 
   // layer switchers
-  PUNC,
-  NUM,
-  FUNC,
   EMOJI,
   GUI,
+  GREEK,
 
   // os switchers
   LINUX,
   WIN,
   OSX,
-};
 
-// Fillers to make layering clearer
+  // others
+  LSPACE,
+  RSPACE,
+  GLOW,
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
+  // stub
+#ifndef FAUXCLICKY_ENABLE
+  FC_TOG,
+#endif
+#ifndef ADAFRUIT_BLE_ENABLE
+  OUT_BLE,
+#endif
+  KEYCODE_END
+};
+
+#define EMPTY MO(_EMPTY)
+#define NUM MO(_NUM)
+#define FUN MO(_FUN)
+#define FUN0 LT(_FUN, KC_0)
 
 // unicode map
 
@@ -106,6 +189,64 @@ enum unicode_name {
   SUN, // sun
   MOON, // moon
   SKULL, // skull
+
+  // greek letters
+  UALPH,
+  UBETA,
+  UGAMM,
+  UDELT,
+  UEPSI,
+  UZETA,
+  UETA,
+  UTHET,
+  UIOTA,
+  UKAPP,
+  ULAMB,
+  UMU,
+  UNU,
+  UXI,
+  UOMIC,
+  UPI,
+  URHO,
+  USIGM,
+  UTAU,
+  UUPSI,
+  UPHI,
+  UCHI,
+  UPSI,
+  UOMEG,
+
+  LALPH,
+  LBETA,
+  LGAMM,
+  LDELT,
+  LEPSI,
+  LZETA,
+  LETA,
+  LTHET,
+  LIOTA,
+  LKAPP,
+  LLAMB,
+  LMU,
+  LNU,
+  LXI,
+  LOMIC,
+  LPI,
+  LRHO,
+  LSIGM,
+  LTAU,
+  LUPSI,
+  LPHI,
+  LCHI,
+  LPSI,
+  LOMEG,
+
+  FSIGM,
+
+  LTEQ,
+  GTEQ,
+  NOTEQ,
+  PLMIN,
 };
 
 const uint32_t PROGMEM unicode_map[] = {
@@ -156,22 +297,68 @@ const uint32_t PROGMEM unicode_map[] = {
   [SUN] = 0x2600,
   [MOON] = 0x1F314,
   [SKULL] = 0x1F480,
-};
-
-
-// hybrid shift - =
-// #undef KC_LSFT
-// #define KC_LSFT MT(MOD_LSFT, KC_MINS)
-// #undef KC_RSFT
-// #define KC_RSFT MT(MOD_LSFT, KC_EQL)
 
-
-// hybrid right-gui & scroll lock (mapped to Compose in OS)
-#undef KC_RCTL
-#define KC_RCTL MT(MOD_LCTL, KC_SLCK)
+  // greek letters
+  [UALPH] = 0x0391,
+  [UBETA] = 0x0392,
+  [UGAMM] = 0x0393,
+  [UDELT] = 0x0394,
+  [UEPSI] = 0x0395,
+  [UZETA] = 0x0396,
+  [UETA] = 0x0397,
+  [UTHET] = 0x0398,
+  [UIOTA] = 0x0399,
+  [UKAPP] = 0x039A,
+  [ULAMB] = 0x039B,
+  [UMU] = 0x039C,
+  [UNU] = 0x039D,
+  [UXI] = 0x039E,
+  [UOMIC] = 0x039F,
+  [UPI] = 0x03A0,
+  [URHO] = 0x03A1,
+  [USIGM] = 0x03A3,
+  [UTAU] = 0x03A4,
+  [UUPSI] = 0x03A5,
+  [UPHI] = 0x03A6,
+  [UCHI] = 0x03A7,
+  [UPSI] = 0x03A8,
+  [UOMEG] = 0x03A9,
+  [LALPH] = 0x03B1,
+  [LBETA] = 0x03B2,
+  [LGAMM] = 0x03B3,
+  [LDELT] = 0x03B4,
+  [LEPSI] = 0x03B5,
+  [LZETA] = 0x03B6,
+  [LETA] = 0x03B7,
+  [LTHET] = 0x03B8,
+  [LIOTA] = 0x03B9,
+  [LKAPP] = 0x03BA,
+  [LLAMB] = 0x03BB,
+  [LMU] = 0x03BC,
+  [LNU] = 0x03BD,
+  [LXI] = 0x03BE,
+  [LOMIC] = 0x03BF,
+  [LPI] = 0x03C0,
+  [LRHO] = 0x03C1,
+  [LSIGM] = 0x03C3,
+  [LTAU] = 0x03C4,
+  [LUPSI] = 0x03C5,
+  [LPHI] = 0x03C6,
+  [LCHI] = 0x03C7,
+  [LPSI] = 0x03C8,
+  [LOMEG] = 0x03C9,
+  [FSIGM] = 0x03C2,
+
+  // other
+  [LTEQ] = 0x2264, // less than or equal
+  [GTEQ] = 0x2265, // greater than or equal
+  [NOTEQ] = 0x2260, // not equal
+  [PLMIN] = 0xB1, // plus minus
+};
 
 // RGBSPS
 
+#ifdef RGBSPS_ENABLE
 const uint8_t PROGMEM LED_ALNUM[] = {
   LED_Z,
   LED_A,
@@ -207,6 +394,17 @@ const uint8_t PROGMEM LED_ALNUM[] = {
   LED_RSPC
 };
 
+const uint8_t PROGMEM LED_HOMING[] = {
+  LED_A,
+  LED_S,
+  LED_D,
+  LED_F,
+  LED_J,
+  LED_K,
+  LED_L,
+  LED_SCLN
+};
+
 const uint8_t PROGMEM LED_MODS[] = {
   LED_TAB,
   LED_ESC,
@@ -225,14 +423,14 @@ const uint8_t PROGMEM LED_MODS[] = {
 const uint8_t PROGMEM LED_FN[] = {
   LED_PUNC,
   LED_NUM,
-  LED_FUNC,
+  LED_FUN,
   LED_EMOJI
 };
 
 const uint8_t PROGMEM LED_INDICATORS[] = {
   LED_IND_EMOJI,
   LED_IND_NUM,
-  LED_IND_FUNC,
+  LED_IND_FUN,
   LED_IND_BATTERY,
   LED_IND_USB,
   LED_IND_BLUETOOTH,
@@ -244,149 +442,105 @@ const uint8_t PROGMEM LED_TRACKPOINT[] = {
   LED_TRACKPOINT3,
 };
 
-void led_reset(void) {
+void led_turnoff_keys(void) {
   for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 15, 6, 0);
+    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 0, 0, 0);
   }
-
   for(uint8_t i = 0; i < COUNT(LED_MODS); i++) {
-    rgbsps_set(pgm_read_byte(&LED_MODS[i]), 15, 0, 0);
+    rgbsps_set(pgm_read_byte(&LED_MODS[i]), 0, 0, 0);
   }
-
   for(uint8_t i = 0; i < COUNT(LED_FN); i++) {
-    rgbsps_set(pgm_read_byte(&LED_FN[i]), 15, 15, 15);
+    rgbsps_set(pgm_read_byte(&LED_FN[i]), 0, 0, 0);
   }
 }
 
-void led_layer_normal(void) {
-  rgbsps_set(LED_IND_FUNC, 0, 0, 0);
-  rgbsps_set(LED_IND_NUM, 0, 0, 0);
-  rgbsps_set(LED_IND_EMOJI, 0, 0, 0);
-
-  led_reset();
-
-  rgbsps_send();
+void led_reset(void) {
+  switch (glow_mode) {
+    case GLOW_NONE:
+      led_turnoff_keys();
+      break;
+    case GLOW_MIN:
+      led_turnoff_keys();
+      for(uint8_t i = 0; i < COUNT(LED_HOMING); i++) {
+        rgbsps_set(pgm_read_byte(&LED_HOMING[i]), 8, 8, 8);
+      }
+      rgbsps_set(LED_F, 15, 0, 0);
+      rgbsps_set(LED_J, 15, 0, 0);
+      break;
+    case GLOW_FULL:
+      for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
+        rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 8, 8, 8);
+      }
+      for(uint8_t i = 0; i < COUNT(LED_MODS); i++) {
+        rgbsps_set(pgm_read_byte(&LED_MODS[i]), 0, 15, 0);
+      }
+      for(uint8_t i = 0; i < COUNT(LED_FN); i++) {
+        rgbsps_set(pgm_read_byte(&LED_FN[i]), 0, 0, 15);
+      }
+      for(uint8_t i = 0; i < COUNT(LED_HOMING); i++) {
+        rgbsps_set(pgm_read_byte(&LED_HOMING[i]), 15, 0, 0);
+      }
+      rgbsps_set(LED_F, 15, 15, 0);
+      rgbsps_set(LED_J, 15, 15, 0);
+      break;
+  }
 }
 
-void led_layer_func(void) {
-  rgbsps_set(LED_IND_FUNC, 0, 15, 0);
-  rgbsps_set(LED_IND_NUM, 0, 0, 0);
+void led_set_layer_indicator(void) {
+  static uint8_t oldlayer = 255;
+
+  rgbsps_set(LED_IND_FUN, 0, 0, 0);
+  // rgbsps_set(LED_IND_NUM, 0, 0, 0);
   rgbsps_set(LED_IND_EMOJI, 0, 0, 0);
 
   led_reset();
 
-  for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 0, 0, 0);
+  uint8_t layer = biton32(layer_state);
+  if (oldlayer == layer) {
+    return;
   }
 
-  rgbsps_set(LED_I, 15, 0, 15);
-  rgbsps_set(LED_J, 15, 0, 15);
-  rgbsps_set(LED_K, 15, 0, 15);
-  rgbsps_set(LED_L, 15, 0, 15);
-
-  rgbsps_set(LED_U, 15, 0, 0);
-  rgbsps_set(LED_O, 15, 0, 0);
-  rgbsps_set(LED_COMM, 15, 0, 0);
-  rgbsps_set(LED_DOT, 15, 0, 0);
-  rgbsps_set(LED_SCLN, 15, 0, 0);
-  rgbsps_set(LED_P, 15, 0, 0);
-
-  rgbsps_set(LED_Q, 0, 15, 0);
-  rgbsps_set(LED_W, 0, 15, 0);
-  rgbsps_set(LED_E, 0, 15, 0);
-  rgbsps_set(LED_R, 0, 15, 0);
-  rgbsps_set(LED_A, 0, 15, 0);
-  rgbsps_set(LED_S, 0, 15, 0);
-  rgbsps_set(LED_D, 0, 15, 0);
-  rgbsps_set(LED_F, 0, 15, 0);
-  rgbsps_set(LED_Z, 0, 15, 0);
-  rgbsps_set(LED_X, 0, 15, 0);
-  rgbsps_set(LED_C, 0, 15, 0);
-  rgbsps_set(LED_V, 0, 15, 0);
-
-  rgbsps_send();
-}
+  oldlayer = layer;
 
-void led_layer_punc(void) {
-  rgbsps_set(LED_IND_FUNC, 0, 15, 0);
-  rgbsps_set(LED_IND_NUM, 0, 0, 15);
-  rgbsps_set(LED_IND_EMOJI, 0, 0, 0);
+  if (layer <= _DEFAULT_LAYER_MAX) {
+    rgbsps_send();
+    return;
+  }
 
-  led_reset();
+  switch(layer) {
+    case _FUN:
+      rgbsps_set(LED_IND_FUN, 15, 0, 0);
+      break;
+    // case _NUM:
+    //   rgbsps_set(LED_IND_NUM, 0, 0, 15);
+    //   break;
+    case _EMOJI:
+      rgbsps_set(LED_IND_EMOJI, 15, 15, 0);
+      break;
+    default:
+      rgbsps_set(LED_IND_FUN, 3, 3, 3);
+      // rgbsps_set(LED_IND_NUM, 3, 3, 3);
+      rgbsps_set(LED_IND_EMOJI, 3, 3, 3);
+  }
 
   rgbsps_send();
 }
 
-void led_layer_num(void) {
-  rgbsps_set(LED_IND_FUNC, 0, 0, 0);
-  rgbsps_set(LED_IND_NUM, 0, 0, 15);
-  rgbsps_set(LED_IND_EMOJI, 0, 0, 0);
-
-  led_reset();
-
-  for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 0, 0, 0);
-  }
-
-  rgbsps_set(LED_U, 0, 5, 15);
-  rgbsps_set(LED_I, 0, 5, 15);
-  rgbsps_set(LED_O, 0, 5, 15);
-  rgbsps_set(LED_J, 0, 5, 15);
-  rgbsps_set(LED_K, 0, 5, 15);
-  rgbsps_set(LED_L, 0, 5, 15);
-  rgbsps_set(LED_M, 0, 5, 15);
-  rgbsps_set(LED_COMM, 0, 5, 15);
-  rgbsps_set(LED_DOT, 0, 5, 15);
-  rgbsps_set(LED_FUNC, 0, 5, 15);
-
-  rgbsps_set(LED_EMOJI, 0, 10, 15);
-  rgbsps_set(LED_RALT, 0, 10, 15);
-
-  rgbsps_set(LED_Q, 0, 10, 15);
-  rgbsps_set(LED_W, 0, 10, 15);
-  rgbsps_set(LED_E, 0, 10, 15);
-  rgbsps_set(LED_R, 0, 10, 15);
-  rgbsps_set(LED_T, 0, 10, 15);
-  rgbsps_set(LED_Y, 0, 10, 15);
-  rgbsps_set(LED_P, 0, 10, 15);
-
-  rgbsps_set(LED_A, 0, 15, 15);
-  rgbsps_set(LED_S, 0, 15, 15);
-  rgbsps_set(LED_D, 0, 15, 15);
-  rgbsps_set(LED_F, 0, 15, 15);
-  rgbsps_set(LED_Z, 0, 15, 15);
-  rgbsps_set(LED_X, 0, 15, 15);
-  rgbsps_set(LED_C, 0, 15, 15);
-  rgbsps_set(LED_V, 0, 15, 15);
-
+void led_set_output_ble(void) {
+  rgbsps_set(LED_IND_BLUETOOTH, 0, 0, 15);
+  rgbsps_set(LED_IND_USB, 0, 0, 0);
   rgbsps_send();
 }
 
-void led_layer_emoji(void) {
-  for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), 15, 15, 0);
-  }
-  for(uint8_t i = 0; i < COUNT(LED_MODS); i++) {
-    rgbsps_set(pgm_read_byte(&LED_MODS[i]), 15, 15, 0);
-  }
-  for(uint8_t i = 0; i < COUNT(LED_FN); i++) {
-    rgbsps_set(pgm_read_byte(&LED_FN[i]), 15, 15, 0);
-  }
-
-  rgbsps_set(LED_IND_FUNC, 0, 0, 0);
-  rgbsps_set(LED_IND_NUM, 0, 0, 0);
-  rgbsps_set(LED_IND_EMOJI, 15, 15, 0);
-
-  rgbsps_set(LED_PUNC, 15, 15, 15);
-  rgbsps_set(LED_EMOJI, 15, 15, 15);
-
+void led_set_output_usb(void) {
+  rgbsps_set(LED_IND_BLUETOOTH, 0, 0, 0);
+  rgbsps_set(LED_IND_USB, 15, 15, 15);
   rgbsps_send();
 }
 
-void led_layer_gui(void) {
-  rgbsps_set(LED_IND_FUNC, 15, 10, 15);
-  rgbsps_set(LED_IND_NUM, 15, 10, 15);
-  rgbsps_set(LED_IND_EMOJI, 15, 10, 15);
+void led_set_output_none(void) {
+  rgbsps_set(LED_IND_BLUETOOTH, 0, 0, 0);
+  rgbsps_set(LED_IND_USB, 0, 0, 0);
   rgbsps_send();
 }
 
@@ -398,15 +552,8 @@ void led_init(void) {
   rgbsps_set(LED_TRACKPOINT1, 15, 0, 0);
   rgbsps_set(LED_TRACKPOINT2, 0, 0, 15);
   rgbsps_set(LED_TRACKPOINT3, 15, 0, 0);
-
-  // // hardcode indicator for now
-  rgbsps_set(LED_IND_BLUETOOTH, 0, 0, 15);
-  rgbsps_set(LED_IND_USB, 15, 15, 15);
-  rgbsps_set(LED_IND_BATTERY, 0, 15, 0);
-
-  led_layer_normal();
 }
-
+#endif // RGBSPS_ENABLE
 
 // keymaps
 
@@ -416,20 +563,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   '  |Enter |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |AltGr | GUI  | Ctrl |
+ * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Fun  |Greek | GUI  |AltGr | Ctrl |
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = KEYMAP(
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT ,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, PUNC,    NUM,     KC_SPC,  KC_SPC,  FUNC,    EMOJI,   KC_RALT, KC_RGUI, KC_RCTL
+  KC_LCTL, KC_LALT, KC_LGUI, EMPTY,   NUM,     LSPACE,  RSPACE,  FUN,     GREEK,   KC_RGUI, C_RALT,  KC_RCTL
 ),
 
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   /  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
+ * `-----------------------------------------------------------------------------------'
+ */
+#ifdef LAYOUT_DVORAK
+[_DVORAK] = KEYMAP(
+  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
+  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    _______,
+  _______, KC_SLSH, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+#endif
+
 /* Colemak
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
@@ -438,15 +605,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |AltGr | GUI  | Ctrl |
+ * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
  * `-----------------------------------------------------------------------------------'
  */
+
+#ifdef LAYOUT_COLEMAK
 [_COLEMAK] = KEYMAP(
   _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, _______,
   _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    _______,
   _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
+#endif
+
+/* Norman
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   D  |   F  |   K  |   J  |   U  |   R  |   L  |   ;  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   E  |   T  |   G  |   Y  |   N  |   I  |   O  |   H  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   P  |   M  |   ,  |   .  |   /  |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
+ * `-----------------------------------------------------------------------------------'
+ */
+
+#ifdef LAYOUT_NORMAN
+[_NORMAN] = KEYMAP(
+  _______, KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    KC_J,    KC_U,    KC_R,    KC_L,    KC_QUOT, _______,
+  _______, KC_A,    KC_S,    KC_E,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,    _______,
+  _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+#endif
 
 /* Workman
  * ,-----------------------------------------------------------------------------------.
@@ -456,67 +647,124 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   K  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |AltGr | GUI  | Ctrl |
+ * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
  * `-----------------------------------------------------------------------------------'
  */
+
+#ifdef LAYOUT_WORKMAN
 [_WORKMAN] = KEYMAP(
   _______, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_QUOT, _______,
   _______, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    _______,
   _______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
+#endif
 
 /* Punc
  * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   `  |
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   ≤  |   ≥  |   `  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |   \  |   -  |   =  |   <  |   >  |   (  |   )  |   '  |      |      |
+ * |      |   *  |   \  |   -  |   =  |   /  |   ≠  |   (  |   )  |   <  |   >  |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |   |  |   _  |   +  |   {  |   }  |   [  |   ]  |   "  |      |      |
+ * |   &  |   ^  |   |  |   _  |   +  |   ?  |   ±  |   [  |   ]  |   {  |   }  |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
+ * |      |      |      |      |      |             |      |      |      |   :  |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_PUNC] = KEYMAP(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_GRV ,
-  XXXXXXX, XXXXXXX, KC_BSLS, KC_MINS,  KC_EQL, KC_LABK, KC_RABK, KC_LPRN, KC_RPRN, KC_QUOT, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_DQUO, XXXXXXX, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______,
+  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______,
+  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COLN, _______
 ),
 
 /* Num
  * ,-----------------------------------------------------------------------------------.
- * |  ^   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   A  |   7  |   8  |   9  |   D  |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |  @   |  A   |  B   |  C   |  (   |  )   |   4  |   5  |   6  |   :  |Enter |
+ * |   `  |   *  |   \  |   -  |   =  |   /  |   B  |   4  |   5  |   6  |   E  |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  &   |  #   |  D   |  E   |  F   |  [   |  ]   |   1  |   2  |   3  |   /  |  *   |
+ * |   &  |   ^  |   |  |   _  |   +  |   ?  |   C  |   1  |   2  |   3  |   F  |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  x   |      |             |   0  |   ,  |   .  |   +  |  -   |
+ * |      |      |   x  |      |      |      |      |   0  |   ,  |   .  |   :  |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_NUM] = KEYMAP(
-  KC_CIRC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  KC_ESC,    KC_AT, S(KC_A), S(KC_B), S(KC_C), KC_LPRN, KC_RPRN,    KC_4,    KC_5,    KC_6, KC_COLN,  KC_ENT,
-  KC_AMPR, KC_HASH, S(KC_D), S(KC_E), S(KC_F), KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_SLSH, KC_ASTR,
-  _______, _______, _______,    KC_X, _______,  KC_SPC,  KC_SPC,    KC_0, KC_COMM,  KC_DOT, KC_PLUS, KC_MINS
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, S(KC_A),  KC_7,    KC_8,    KC_9,   S(KC_D), _______,
+  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, S(KC_B),  KC_4,    KC_5,    KC_6,   S(KC_E), _______,
+  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C),  KC_1,    KC_2,    KC_3,   S(KC_F), _______,
+  _______, _______, KC_X,    _______, _______, _______, _______,  FUN0 ,   KC_COMM, KC_DOT, KC_COLN, _______
 ),
 
 /* Func
  * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |      |      | PgUp |  Up  | PgDn | PgUp | Del  |
+ * |      |  F1  |  F2  |  F3  |  F4  | Ins  |      | PgUp |  Up  | PgDn | PgUp |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |PrtSc |      | Left | Down | Right| PgDn | Ins  |
+ * | Caps |  F5  |  F6  |  F7  |  F8  |PrtSc |      | Left | Down | Right| PgDn |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |      |      |      | Home |  End |      |      |
+ * |      |  F9  |  F10 |  F11 |  F12 |Pause |      |      | Home |  End |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[_FUNC] = KEYMAP(
-  XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX, XXXXXXX, KC_PGUP,   KC_UP, KC_PGDN, KC_PGUP,  KC_DEL,
-  XXXXXXX,   KC_F5,   KC_F6,   KC_F7,  KC_F8,KC_PSCREEN,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_INS,
-  _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME,  KC_END, XXXXXXX, _______,
+[_FUN] = KEYMAP(
+  XXXXXXX,   KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_INS,  XXXXXXX, KC_PGUP,   KC_UP, KC_PGDN, KC_PGUP, KC_DEL,
+  KC_CAPS,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
+  _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME,  KC_END, XXXXXXX, _______,
+  _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Uppercase Greek
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_GREEKU] = KEYMAP(
+  _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC),  X(UPI), _______,
+  _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA),  X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______,
+  _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA),  X(UNU),  X(UMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Lowercase Greek
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_GREEKL] = KEYMAP(
+  _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC),  X(LPI), _______,
+  _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA),  X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______,
+  _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA),  X(LNU),  X(LMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Empty
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_EMPTY] = KEYMAP(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 ),
 
@@ -535,65 +783,201 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW),
   X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART),  X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS),
   X(THMDN),X(SLEEP), X(CLAP),  X(CRY),  X(VIC),X(BHART),  X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH),
-    X(POO), X(EYES),X(HUNRD), _______,X(SKULL),X(HORNS), X(HALO), X(FEAR), _______,X(YUMMY),X(DISAP),X(NOEVK)
+    X(POO), X(EYES), X(HUNRD),_______, X(SKULL),X(HORNS), X(HALO), X(FEAR),_______,X(YUMMY),X(DISAP),X(NOEVK)
 ),
 
 /* GUI
  * ,-----------------------------------------------------------------------------------.
  * |      |  D1  |  D2  |  D3  |  D4  |  D5  |  D6  |  D7  |  D8  |  D9  |  D10 |      |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Linux |      | Vol- | Mute | Vol+ |      |      |  D-  |      |  D+  |      |Qwerty|
+ * | Esc  |      | Btab | Esc  | Tab  |      |      | Prev |      | Next |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Win  |      | Prev | Play | Next |      |      |      |      |      |      |Colmak|
+ * |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | OSX  |      |      |      |      |  BL- |  BL+ |      |      |      |      |Workmn|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_GUI] = KEYMAP(
-  _______, LGUI(KC_1),LGUI(KC_2),LGUI(KC_3),LGUI(KC_4),LGUI(KC_5),LGUI(KC_6),LGUI(KC_7),LGUI(KC_8),LGUI(KC_9),LGUI(KC_0), _______,
-    LINUX, _______, KC_VOLD, KC_MUTE, KC_VOLU,_______,_______,KC_WWW_BACK,_______,KC_WWW_FORWARD,KC_PAUS, QWERTY,
-      WIN, _______, KC_MPRV, KC_MPLY, KC_MNXT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, COLEMAK,
-      OSX, _______, _______, _______, _______,  BL_DEC,  BL_INC, _______, _______, RGB_VAI, RGB_VAD, WORKMAN
+  XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX,
+  KC_ESC,  XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB,  XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC,  KC_SPC,  KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
 ),
 
-};
+/* Sys
+ * ,-----------------------------------------------------------------------------------.
+ * |      |Qwerty| Win  |      |Reset |      |      | USB  |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |Audio |      |Dvorak|      | Glow |      |      |WorkMn|Linux |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |Colmak|      | BLE  |Norman|MacOS |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_SYS] = KEYMAP(
+  XXXXXXX, QWERTY,  WIN,     XXXXXXX, RESET,   XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BLE, NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
+),
 
-#ifdef AUDIO_ENABLE
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_workman[][2]    = SONG(DVORAK_SOUND);
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-float tone_linux[][2] = SONG(CAPS_LOCK_ON_SOUND);
-float tone_windows[][2] = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_osx[][2] = SONG(NUM_LOCK_ON_SOUND);
-float tone_click[][2] = SONG(MUSICAL_NOTE(_F3, 2));
-#endif
+
+};
 
 void persistant_default_layer_set(uint16_t default_layer) {
   eeconfig_update_default_layer(default_layer);
   default_layer_set(default_layer);
 }
 
+#ifdef DOUBLESPACE_LAYER_ENABLE
+void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *isemitted) {
+  if (pressed) {
+    *isactive = true;
+    if (*otheractive) {
+      layer_on(_SPACE);
+      register_code(KC_LALT);  // sends alt and enter layer
+      space_layer_entered = true;
+    }
+  } else {
+    *isactive = false;
+    if (space_layer_entered) {
+      unregister_code(KC_LALT);  // release alt and exit layer
+      layer_off(_SPACE);
+      if (!*otheractive) {
+        space_layer_entered = false;
+      }
+    } else {
+      if (!*isemitted) {
+        register_code(KC_SPC);
+        unregister_code(KC_SPC);
+      }
+      *isemitted = false;
+    }
+  }
+}
+#endif
+
+uint32_t layer_state_set_kb(uint32_t state)
+{
+  // turn on punc layer if both fun & num are on
+  if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {
+    state |= (1UL<<_PUNC);
+  } else {
+    state &= ~(1UL<<_PUNC);
+  }
+
+  // turn on emoji layer if empty and greek layer are on
+  if (
+    (state & ((1UL<<_EMPTY) | (1UL<<_GREEKU))) == ((1UL<<_EMPTY) | (1UL<<_GREEKU))
+    || (state & ((1UL<<_EMPTY) | (1UL<<_GREEKL))) == ((1UL<<_EMPTY) | (1UL<<_GREEKL))
+  ) {
+    state |= (1UL<<_EMOJI);
+  } else {
+    state &= ~(1UL<<_EMOJI);
+  }
+  return state;
+}
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef AUDIO_ENABLE
-  // faux clicky
-  if (record->event.pressed) PLAY_NOTE_ARRAY(tone_click, false, 0);
-  #endif
+  static bool lshift = false;
+  static bool rshift = false;
+  static uint8_t layer = 0;
+
+  lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
+  rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
+  layer = biton32(layer_state);
+
+#ifdef DOUBLESPACE_LAYER_ENABLE
+  // double-space: send space immediately if any other key depressed before space is released
+  if ((lspace_active ^ rspace_active)
+      && keycode != LSPACE
+