diff --git a/assets/pics/layouts/dilemma.png b/assets/pics/layouts/dilemma.png
new file mode 100644
index 0000000..8b17c3b
Binary files /dev/null and b/assets/pics/layouts/dilemma.png differ
diff --git a/assets/pics/layouts/dilemma.svg b/assets/pics/layouts/dilemma.svg
new file mode 100644
index 0000000..268df37
--- /dev/null
+++ b/assets/pics/layouts/dilemma.svg
@@ -0,0 +1,1052 @@
+
diff --git a/assets/pics/layouts/dilemma.yaml b/assets/pics/layouts/dilemma.yaml
new file mode 100644
index 0000000..938d48c
--- /dev/null
+++ b/assets/pics/layouts/dilemma.yaml
@@ -0,0 +1,41 @@
+layout: {qmk_keyboard: bastardkb/dilemma/3x5_3, qmk_layout: LAYOUT_split_3x5_3}
+draw_config:
+ svg_extra_style: |
+ text.label { stroke: none; fill: #e0f0f0;}
+layers:
+ Base:
+ - [Q, W, E, R, T, Y, U, I, O, P]
+ - [{t: A, h: LGUI}, {t: S, h: LALT}, {t: D, h: LCTL}, {t: F, h: LSFT}, G, H, {t: J, h: LSFT}, {t: K, h: LCTL}, {t: L, h: LALT}, {t: '''', h: LGUI}]
+ - [{t: Z, h: MOUSE}, X, C, V, B, N, M, ',', ., {t: '/', h: MOUSE}]
+ - [CAPS WORD, {t: TAB, h: FUN}, {t: SPC, h: NAV}]
+ - [{t: ENT, h: SYM}, {t: BSPC, h: NUM}, 🔇 MUTE]
+ Nav:
+ - ['', '', '', '', '', '', '', '', '', '']
+ - [⊞ LGUI, ⌥ LALT, ⎈ LCTL, ⇧ LSFT, '', ⇪ CAPS LOCK, 🡄 LEFT, 🡇 DOWN, 🡅 UP, 🡆 RIGHT]
+ - ['', '', '', '', '', INS, ⤒ HOME, ⇟ PGDN, ⇞ PGUP, ⤓ END]
+ - ['', '', {t: ▽, type: held}]
+ - [⮠ ENT, ⌫ BSPC, ⌦ DEL]
+ Mouse:
+ - [BOOT, EE CLR, '', DPI, Snipe DPI, Snipe DPI, DPI, '', EE CLR, BOOT]
+ - [⊞ LGUI, ⌥ LALT, ⎈ LCTL, ⇧ LSFT, '', '', ⇧ LSFT, ⎈ LCTL, ⌥ LALT, ⊞ LGUI]
+ - [{t: ▽, type: held}, DRAG SCROLL, SNIPE, '', '', '', '', SNIPE, DRAG SCROLL, {t: ▽, type: held}]
+ - [MOUSE 3, MOUSE 2, MOUSE 1]
+ - [MOUSE 1, MOUSE 2, MOUSE 3]
+ Num:
+ - ['[', '7', '8', '9', ']', '', '', '', '', '']
+ - [;, '4', '5', '6', '=', '', ⇧ LSFT, ⎈ LCTL, ⌥ LALT, ⊞ LGUI]
+ - ['`', '1', '2', '3', \, '', '', '', '', '']
+ - [., '-', '0']
+ - ['', {t: ▽, type: held}, '']
+ Sym:
+ - ['{', '&', '*', (, '}', '', '', '', '', '']
+ - [':', $, '%', ^, +, '', ⇧ LSFT, ⎈ LCTL, ⌥ LALT, ⊞ LGUI]
+ - ['~', '!', '@', '#', '|', '', '', '', '', '']
+ - [(, '', _]
+ - ['', {t: ▽, type: held}, '']
+ Fun:
+ - ['', '', '', '', '', PRINT SCREEN, F7, F8, F9, F12]
+ - [⊞ LGUI, ⌥ LALT, ⎈ LCTL, ⇧ LSFT, '', SCROLL LOCK, F4, F5, F6, F11]
+ - ['', '', '', '', '', PAUSE, F1, F2, F3, F10]
+ - ['', {t: ▽, type: held}, '']
+ - ['', '', '']
diff --git a/assets/pics/layouts/dilemma/Base.png b/assets/pics/layouts/dilemma/Base.png
new file mode 100644
index 0000000..faf70fd
Binary files /dev/null and b/assets/pics/layouts/dilemma/Base.png differ
diff --git a/assets/pics/layouts/dilemma/Base.svg b/assets/pics/layouts/dilemma/Base.svg
new file mode 100644
index 0000000..7a082f2
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Base.svg
@@ -0,0 +1,275 @@
+
diff --git a/assets/pics/layouts/dilemma/Fun.png b/assets/pics/layouts/dilemma/Fun.png
new file mode 100644
index 0000000..1a446e9
Binary files /dev/null and b/assets/pics/layouts/dilemma/Fun.png differ
diff --git a/assets/pics/layouts/dilemma/Fun.svg b/assets/pics/layouts/dilemma/Fun.svg
new file mode 100644
index 0000000..88d6c00
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Fun.svg
@@ -0,0 +1,253 @@
+
diff --git a/assets/pics/layouts/dilemma/Mouse.png b/assets/pics/layouts/dilemma/Mouse.png
new file mode 100644
index 0000000..395c2ed
Binary files /dev/null and b/assets/pics/layouts/dilemma/Mouse.png differ
diff --git a/assets/pics/layouts/dilemma/Mouse.svg b/assets/pics/layouts/dilemma/Mouse.svg
new file mode 100644
index 0000000..d16b0fa
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Mouse.svg
@@ -0,0 +1,289 @@
+
diff --git a/assets/pics/layouts/dilemma/Nav.png b/assets/pics/layouts/dilemma/Nav.png
new file mode 100644
index 0000000..4167aad
Binary files /dev/null and b/assets/pics/layouts/dilemma/Nav.png differ
diff --git a/assets/pics/layouts/dilemma/Nav.svg b/assets/pics/layouts/dilemma/Nav.svg
new file mode 100644
index 0000000..e6504d8
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Nav.svg
@@ -0,0 +1,272 @@
+
diff --git a/assets/pics/layouts/dilemma/Num.png b/assets/pics/layouts/dilemma/Num.png
new file mode 100644
index 0000000..51a2c0d
Binary files /dev/null and b/assets/pics/layouts/dilemma/Num.png differ
diff --git a/assets/pics/layouts/dilemma/Num.svg b/assets/pics/layouts/dilemma/Num.svg
new file mode 100644
index 0000000..eda00dc
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Num.svg
@@ -0,0 +1,252 @@
+
diff --git a/assets/pics/layouts/dilemma/Sym.png b/assets/pics/layouts/dilemma/Sym.png
new file mode 100644
index 0000000..d37d2a0
Binary files /dev/null and b/assets/pics/layouts/dilemma/Sym.png differ
diff --git a/assets/pics/layouts/dilemma/Sym.svg b/assets/pics/layouts/dilemma/Sym.svg
new file mode 100644
index 0000000..3700f5c
--- /dev/null
+++ b/assets/pics/layouts/dilemma/Sym.svg
@@ -0,0 +1,251 @@
+
diff --git a/assets/pics/layouts/dilemma_max.png b/assets/pics/layouts/dilemma_max.png
new file mode 100644
index 0000000..fb42d35
Binary files /dev/null and b/assets/pics/layouts/dilemma_max.png differ
diff --git a/assets/pics/layouts/dilemma_max.svg b/assets/pics/layouts/dilemma_max.svg
new file mode 100644
index 0000000..efe62d0
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max.svg
@@ -0,0 +1,1108 @@
+
diff --git a/assets/pics/layouts/dilemma_max.yaml b/assets/pics/layouts/dilemma_max.yaml
new file mode 100644
index 0000000..4532f6d
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max.yaml
@@ -0,0 +1,33 @@
+layout: {qmk_keyboard: bastardkb/dilemma/4x6_4, qmk_layout: LAYOUT}
+draw_config:
+ svg_extra_style: |
+ text.label { stroke: none; fill: #e0f0f0;}
+layers:
+ Base:
+ - [⎋ ESC, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-']
+ - [↹ TAB, Q, W, E, R, T, Y, U, I, O, P, \]
+ - [⇧ LSFT, A, S, D, F, G, H, J, K, L, ;, '''']
+ - [⎈ LCTL, {t: Z, h: Mouse}, X, C, V, B, N, M, ',', ., {t: '/', h: Mouse}, ⌥ LALT]
+ - [⌥ LALT, ⌫ BSPC, ␣ SPC, {t: LOWER, h: MO}]
+ - [{t: RAISE, h: MO}, ⮠ ENTER, ⌦ DEL, 🔇 MUTE]
+ Lower:
+ - ['~', '!', '@', '#', $, '%', ^, '&', '*', (, ), _]
+ - [RGB MOD, '', '', '', '', '', '[', KP 7, KP 8, KP 9, ']', '']
+ - [RGB TOG, ⊞ LGUI, ⌥ LALT, ⎈ LCTL, ⇧ LSFT, '', KP +, KP 4, KP 5, KP 6, KP -, KP =]
+ - [RGB RMOD, '', '', '', '', '', KP *, KP 1, KP 2, KP 3, KP /, KP .]
+ - ['', '', '', {t: ▽, type: held}]
+ - ['', ▽, '', '']
+ Raise:
+ - [F12, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11]
+ - [⏭️ NEXT, '', '', '', '', '', '', '', '', '', '', 🔊 VOL UP]
+ - [⏯️ PLAY PAUSE, 🡄 LEFT, 🡅 UP, 🡇 DOWN, 🡆 RIGHT, '', '', ⇧ RSFT, ⎈ RCTL, ⌥ RALT, ⊞ RGUI, 🔇 MUTE]
+ - [⏮️ PREV, ⤒ HOME, ⇞ PGUP, ⇟ PGDN, ⤓ END, '', '', '', '', '', '', 🔉 VOL DOWN]
+ - ['', ▽, ▽, '']
+ - [{t: ▽, type: held}, '', '', '']
+ Mouse:
+ - ['', '', '', '', '', '', '', '', '', '', '', '']
+ - ['', '', '', '', DPI, Snipe DPI, Snipe DPI, DPI, '', '', '', '']
+ - ['', ⊞ LGUI, ⌥ LALT, ⎈ LCTL, ⇧ LSFT, '', '', ⇧ RSFT, ⎈ RCTL, ⌥ RALT, ⊞ RGUI, '']
+ - ['', {t: ▽, type: held}, DRAG SCROLL, SNIPE, EE CLR, QK BOOT, QK BOOT, EE CLR, SNIPE, DRAG SCROLL, {t: ▽, type: held}, '']
+ - ['', MOUSE 2, MOUSE 1, MOUSE 3]
+ - [MOUSE 3, MOUSE 1, MOUSE 2, '']
diff --git a/assets/pics/layouts/dilemma_max/Base.png b/assets/pics/layouts/dilemma_max/Base.png
new file mode 100644
index 0000000..e38f718
Binary files /dev/null and b/assets/pics/layouts/dilemma_max/Base.png differ
diff --git a/assets/pics/layouts/dilemma_max/Base.svg b/assets/pics/layouts/dilemma_max/Base.svg
new file mode 100644
index 0000000..a659c05
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max/Base.svg
@@ -0,0 +1,363 @@
+
diff --git a/assets/pics/layouts/dilemma_max/Lower.png b/assets/pics/layouts/dilemma_max/Lower.png
new file mode 100644
index 0000000..7c1728d
Binary files /dev/null and b/assets/pics/layouts/dilemma_max/Lower.png differ
diff --git a/assets/pics/layouts/dilemma_max/Lower.svg b/assets/pics/layouts/dilemma_max/Lower.svg
new file mode 100644
index 0000000..b05e8ee
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max/Lower.svg
@@ -0,0 +1,363 @@
+
diff --git a/assets/pics/layouts/dilemma_max/Mouse.png b/assets/pics/layouts/dilemma_max/Mouse.png
new file mode 100644
index 0000000..46b7f1f
Binary files /dev/null and b/assets/pics/layouts/dilemma_max/Mouse.png differ
diff --git a/assets/pics/layouts/dilemma_max/Mouse.svg b/assets/pics/layouts/dilemma_max/Mouse.svg
new file mode 100644
index 0000000..d7ee7d2
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max/Mouse.svg
@@ -0,0 +1,353 @@
+
diff --git a/assets/pics/layouts/dilemma_max/Raise.png b/assets/pics/layouts/dilemma_max/Raise.png
new file mode 100644
index 0000000..24285e0
Binary files /dev/null and b/assets/pics/layouts/dilemma_max/Raise.png differ
diff --git a/assets/pics/layouts/dilemma_max/Raise.svg b/assets/pics/layouts/dilemma_max/Raise.svg
new file mode 100644
index 0000000..e759256
--- /dev/null
+++ b/assets/pics/layouts/dilemma_max/Raise.svg
@@ -0,0 +1,353 @@
+
diff --git a/assets/pics/layouts/render_full_boards.sh b/assets/pics/layouts/render_full_boards.sh
index 21113c9..58dce23 100755
--- a/assets/pics/layouts/render_full_boards.sh
+++ b/assets/pics/layouts/render_full_boards.sh
@@ -7,7 +7,7 @@ ensure_exists_in_path() {
ensure_exists_in_path keymap
ensure_exists_in_path convert
-for board in cnano cmini charybdis skeletyl tbkmini scylla; do
+for board in cnano cmini charybdis skeletyl tbkmini scylla dilemma dilemma_max; do
echo $board
keymap draw $board.yaml > $board.svg
convert -size 800x800 -background '#303030' $board.svg $board.png
diff --git a/assets/pics/layouts/render_single_layers.sh b/assets/pics/layouts/render_single_layers.sh
index 92f9165..5059491 100755
--- a/assets/pics/layouts/render_single_layers.sh
+++ b/assets/pics/layouts/render_single_layers.sh
@@ -9,7 +9,7 @@ ensure_exists_in_path tr
ensure_exists_in_path keymap
ensure_exists_in_path convert
-for board in cnano cmini charybdis skeletyl tbkmini scylla; do
+for board in cnano cmini charybdis skeletyl tbkmini scylla dilemma dilemma_max; do
echo $board
rm -r $board
mkdir -p $board
diff --git a/fw/default-keymaps.md b/fw/default-keymaps.md
index aa779e5..a966bae 100644
--- a/fw/default-keymaps.md
+++ b/fw/default-keymaps.md
@@ -57,11 +57,27 @@ For more information on the features from the Charybdis keymaps, see the [charyb
# Dilemma MAX
-// TODO
+
+
+
+
+
+
+
# Dilemma
-// TODO
+
+
+
+
+
+
+
+
+
+
+
# Scylla
@@ -95,4 +111,4 @@ For more information on the features from the Charybdis keymaps, see the [charyb
----
-[chary]: {{site.baseurl}}/fw/charybdis-features.html
\ No newline at end of file
+[chary]: {{site.baseurl}}/fw/charybdis-features.html