diff --git a/keyboards/anne_pro/keymaps/anne-pro-2-mac/keymap.c b/keyboards/anne_pro/keymaps/anne-pro-2-mac/keymap.c
new file mode 100644
index 0000000000..dca0b40dc0
--- /dev/null
+++ b/keyboards/anne_pro/keymaps/anne-pro-2-mac/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2019 Michiel Visser
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Anne Pro 2 MacOS layout
+Includes Media Keys and TAP features, see readme.md */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, 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,	MT(MOD_RSFT, KC_UP),
+      KC_LCTL, KC_LALT,   KC_LGUI,                   KC_SPACE,                     KC_LALT, LT(1,KC_LEFT), LT(2,KC_DOWN), MT(MOD_RCTL, KC_RGHT)
+  ),
+  [1] = LAYOUT(
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
+      XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   KC_SLCK, KC_PAUS, KC_HOME, KC_END,  KC_PSCR,
+      XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, KC_PGDN,          XXXXXXX,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(3),   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DEL,                   _______,
+      _______, _______, _______,                   XXXXXXX,                                     _______, _______, _______, _______
+  ),
+  [2] = LAYOUT(
+      RESET,   KC_MSTP, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, XXXXXXX, APL_MOD, APL_RGB, APL_RAT, APL_BRT, 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, XXXXXXX, XXXXXXX,                   _______,
+      _______, _______, _______,                   XXXXXXX,                                     _______, _______, _______, _______
+  ),
+  [3] = LAYOUT(
+      TG(3),   APB_HC1, APB_HC2, APB_HC3, APB_HC4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, APB_LGC, APB_OFF, APB_ON,  XXXXXXX,
+      XXXXXXX, APB_HS1, APB_HS2, APB_HS3, APB_HS4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX, APB_HD1, APB_HD2, APB_HD3, APB_HD4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,
+      APB_HLQ, XXXXXXX, XXXXXXX,                   XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  ),
+};
diff --git a/keyboards/anne_pro/keymaps/anne-pro-2-mac/readme.md b/keyboards/anne_pro/keymaps/anne-pro-2-mac/readme.md
new file mode 100644
index 0000000000..972380c7cb
--- /dev/null
+++ b/keyboards/anne_pro/keymaps/anne-pro-2-mac/readme.md
@@ -0,0 +1,45 @@
+# Anne Pro 2 MAC keymap  
+
+### This keymap adds TAP, Media Keys features and AP2-like backlight control.  
+### Maintainer: [angelokofficial](https://github.com/angelokofficial)
+
+
+__Keys:__
+
+ANNE+0 - off/on the backlight  
+ANNE+9 - switch the backlight profile  
+ANNE + =/+ - increases brightness  
+ANNE + - -/_ - changes backlight speed  
+ANNE+ESC - reset the keyboard (instead of button on the back side)  
+ANNE+ESC+hold ESC - enter to the bootloader (DFU) mode  
+
+__TAP:__
+
+Right Shift - up arrow  
+ANNE - down arrow  
+FN - left arrow  
+Right CTRL - right arrow  
+
+
+__Bluetooth:__
+
+Fn+B - enter BT mode  
+=/+ - turn ON BT  
+-/_ - turn OFF BT  
+0 - enter legacy BT mode  
+1,2,3,4 - should work as bt profiles for switch among connected devices  
+
+
+**Media keys:**
+
+ANNE+1 - stop  
+ANNE+2 - volume down  
+ANNE+3 - volume up  
+ANNE+4 - previous track  
+ANNE+5 - pause/play  
+ANNE+6 - next track  
+ANNE+7 - mute/unmute volume  
+
+
+All other keys remain on their own places.  
+To compile: `make anne_pro:<your_keymap>`
diff --git a/keyboards/anne_pro/keymaps/anne-pro-2-win/keymap.c b/keyboards/anne_pro/keymaps/anne-pro-2-win/keymap.c
new file mode 100644
index 0000000000..1573b0d672
--- /dev/null
+++ b/keyboards/anne_pro/keymaps/anne-pro-2-win/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2019 Michiel Visser
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Anne Pro 2 default layout
+Includes Media Keys and TAP features, see readme.md */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, 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,	MT(MOD_RSFT, KC_UP),
+      KC_LCTL, KC_LGUI,   KC_LALT,                   KC_SPACE,                     KC_LALT, LT(1,KC_LEFT), LT(2,KC_DOWN), MT(MOD_RCTL, KC_RGHT)
+  ),
+  [1] = LAYOUT(
+      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
+      XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   KC_SLCK, KC_PAUS, KC_HOME, KC_END,  KC_PSCR,
+      XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, KC_PGDN,          XXXXXXX,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(3),   XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DEL,                   _______,
+      _______, _______, _______,                   XXXXXXX,                                     _______, _______, _______, _______
+  ),
+  [2] = LAYOUT(
+      RESET,   KC_MSTP, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, XXXXXXX, APL_MOD, APL_RGB, APL_RAT, APL_BRT, 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, XXXXXXX, XXXXXXX,                   _______,
+      _______, _______, _______,                   XXXXXXX,                                     _______, _______, _______, _______
+  ),
+  [3] = LAYOUT(
+      TG(3),   APB_HC1, APB_HC2, APB_HC3, APB_HC4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, APB_LGC, APB_OFF, APB_ON,  XXXXXXX,
+      XXXXXXX, APB_HS1, APB_HS2, APB_HS3, APB_HS4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX, APB_HD1, APB_HD2, APB_HD3, APB_HD4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,
+      APB_HLQ, XXXXXXX, XXXXXXX,                   XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  ),
+};
diff --git a/keyboards/anne_pro/keymaps/anne-pro-2-win/readme.md b/keyboards/anne_pro/keymaps/anne-pro-2-win/readme.md
new file mode 100644
index 0000000000..9aa9052625
--- /dev/null
+++ b/keyboards/anne_pro/keymaps/anne-pro-2-win/readme.md
@@ -0,0 +1,45 @@
+# Anne Pro 2 Windows keymap  
+
+### This keymap adds TAP, Media Keys features and AP2-like backlight control.  
+### Maintainer: [angelokofficial](https://github.com/angelokofficial)
+
+
+__Keys:__
+
+ANNE+0 - off/on the backlight  
+ANNE+9 - switch the backlight profile  
+ANNE + =/+ - increases brightness  
+ANNE + - -/_ - changes backlight speed  
+ANNE+ESC - reset the keyboard (instead of button on the back side)  
+ANNE+ESC+hold ESC - enter to the bootloader (DFU) mode  
+
+__TAP:__
+
+Right Shift - up arrow  
+ANNE - down arrow  
+FN - left arrow  
+Right CTRL - right arrow  
+
+
+__Bluetooth:__
+
+Fn+B - enter BT mode  
+=/+ - turn ON BT  
+-/_ - turn OFF BT  
+0 - enter legacy BT mode  
+1,2,3,4 - should work as bt profiles for switch among connected devices  
+
+
+**Media keys:**
+
+ANNE+1 - stop  
+ANNE+2 - volume down  
+ANNE+3 - volume up  
+ANNE+4 - previous track  
+ANNE+5 - pause/play  
+ANNE+6 - next track  
+ANNE+7 - mute/unmute volume  
+
+
+All other keys remain on their own places.  
+To compile: `make anne_pro:<your_keymap>`