8 files changed, 31 insertions, 5 deletions

diff --git a/layouts/community/ergodox/algernon/NEWS.md b/layouts/community/ergodox/algernon/NEWS.md
index 1bc2b5dc6..a6ce9813b 100644
--- a/layouts/community/ergodox/algernon/NEWS.md
+++ b/layouts/community/ergodox/algernon/NEWS.md
@@ -1,5 +1,18 @@
 <!-- -*- mode: markdown; fill-column: 8192 -*- -->
 
+## v1.12
+
+*2018-11-22*
+
+### Overall changes
+
+* Updated to work with QMK master.
+
+### Miscellaneous
+
+* The `😂` symbol can be entered with UCIS.
+* `LEAD r` now inputs `Right Alt`.
+
 ## v1.11
 
 *2017-10-01*
diff --git a/layouts/community/ergodox/algernon/images/adore-layer.png b/layouts/community/ergodox/algernon/images/adore-layer.png
new file mode 100644
index 000000000..75d2ca4f0
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/adore-layer.png
diff --git a/layouts/community/ergodox/algernon/images/base-layer.png b/layouts/community/ergodox/algernon/images/base-layer.png
new file mode 100644
index 000000000..2ca7a273b
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/base-layer.png
diff --git a/layouts/community/ergodox/algernon/images/heatmap.png b/layouts/community/ergodox/algernon/images/heatmap.png
new file mode 100644
index 000000000..4f55c5adf
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/heatmap.png
diff --git a/layouts/community/ergodox/algernon/images/steno-layer.png b/layouts/community/ergodox/algernon/images/steno-layer.png
new file mode 100644
index 000000000..9a2ba55ef
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/steno-layer.png
diff --git a/layouts/community/ergodox/algernon/keymap.c b/layouts/community/ergodox/algernon/keymap.c
index ebdc4ab4e..fb6de1b72 100644
--- a/layouts/community/ergodox/algernon/keymap.c
+++ b/layouts/community/ergodox/algernon/keymap.c
@@ -13,6 +13,7 @@
 #include "eeconfig.h"
 #include "wait.h"
 #include "version.h"
+#include "print.h"
 
 /* Layers */
 
@@ -1033,6 +1034,10 @@ void matrix_scan_user(void) {
     }
 #endif
 
+    SEQ_ONE_KEY (KC_R) {
+      ang_tap(KC_RALT, 0);
+    }
+
     SEQ_ONE_KEY (KC_T) {
       time_travel = !time_travel;
     }
@@ -1126,7 +1131,8 @@ const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE
  UCIS_SYM("micro", 0x00b5),
  UCIS_SYM("tm", 0x2122),
  UCIS_SYM("child", 0x1f476),
- UCIS_SYM("family", 0x1F46A)
+ UCIS_SYM("family", 0x1F46A),
+ UCIS_SYM("joy", 0x1F602)
 );
 
 bool process_record_user (uint16_t keycode, keyrecord_t *record) {
diff --git a/layouts/community/ergodox/algernon/readme.md b/layouts/community/ergodox/algernon/readme.md
index 03b094edb..a25018a7b 100644
--- a/layouts/community/ergodox/algernon/readme.md
+++ b/layouts/community/ergodox/algernon/readme.md
@@ -3,7 +3,12 @@
 algernon's layout
 =======================
 
-This is an unconventional layout for the [ErgoDox EZ][ez]. For more details about the history of the layout, see my [blog posts about my ErgoDox journey][blog-ergodox].
+This is the layout I used to use on my [ErgoDox EZ][ez], while I was using [QMK][qmk]. I no longer do so, and this repository is obsolete, and not updated anymore. My current firmware is based on [Kaleidoscope][kaleidoscope], and is located [elsewhere][ergodox-sketch]. I'm keeping the repo around for historical and educational purposes.
+
+ [kaleidoscope]: https://github.com/keyboardio/Kaleidoscope
+ [ergodox-sketch]: https://git.madhouse-project.org/algernon/ErgoDox-sketch
+
+Nevertheless, this is an unconventional layout for the [ErgoDox EZ][ez]. For more details about the history of the layout, see my [blog posts about my ErgoDox journey][blog-ergodox].
 
  [ez]: https://ergodox-ez.com/
  [blog-ergodox]: https://asylum.madhouse-project.org/blog/tags/ergodox/
@@ -57,6 +62,7 @@ At its core, this is a Dvorak layout, with some minor changes. The more interest
     - `LEAD d` toggles logging keypress positions to the HID console.
     - `LEAD t` toggles time travel. Figuring out the current `date` is left as an exercise to the reader.
     - `LEAD u` enters the [Unicode symbol input](#unicode-symbol-input) mode.
+    - `LEAD r` inputs `Right Alt`, which is the `Compose` key of my choice.
 
 The symbols on the front in the image above have the same color as the key that activates them, with the exception of the **Arrow** layer, which is just black on the front.
 
@@ -128,13 +134,13 @@ $ git clone https://github.com/qmk/qmk_firmware.git
 $ cd qmk_firmware
 $ git clone https://github.com/algernon/ergodox-layout.git \
             layouts/community/ergodox/algernon_master
-$ make ergodox_ez-algernon_master
+$ make ergodox_ez:algernon_master
 ```
 
 From time to time, updates may be submitted back to the QMK repository. If you are reading it there, you can build the firmware like any other firmware included with it (assuming you are in the root directory of the firmware):
 
 ```
-$ make ergodox_ez-algernon
+$ make ergodox_ez:algernon
 ```
 
 ## Using on Windows
diff --git a/layouts/community/ergodox/algernon/rules.mk b/layouts/community/ergodox/algernon/rules.mk
index 53dec5153..1b4c0995f 100644
--- a/layouts/community/ergodox/algernon/rules.mk
+++ b/layouts/community/ergodox/algernon/rules.mk
@@ -9,8 +9,9 @@ KEYLOGGER_ENABLE ?= yes
 UCIS_ENABLE = yes
 MOUSEKEY_ENABLE = no
 LEADER_ENABLE = yes
+RGBLIGHT_ENABLE = no
 
-AUTOLOG_ENABLE ?= no
+AUTOLOG_ENABLE ?= yes
 
 ifeq (${FORCE_NKRO},yes)
 OPT_DEFS += -DFORCE_NKRO