diff --git a/editor/index.html b/editor/index.html
index fe192281a5..371591ebdd 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -39,9 +39,10 @@ <h2>Online Keymap Editor for TMK products</h2>
             <ul>
                 <li>TMK Converter(ATmega32U4): [ <a href="unimap/?usb_usb">Full-key</a> ]
             </ul>
-        <li><a id="next_usb" href="#next_usb"></a>NeXT-USB Converter <font size="1">[ <a href="">info</a> | <a href="https://github.com/tmk/tmk_keyboard/tree/master/converter/next_usb">code</a> | <a href="https://geekhack.org/index.php?topic=72052.0">buy</a> ]</font>
+        <li><a id="next_usb" href="#next_usb"></a>NeXT-USB Converter <font size="1">[ <a href="">info</a> | <a href="https://github.com/tmk/tmk_keyboard/tree/master/converter/next_usb_ng">code</a> | <a href="https://geekhack.org/index.php?topic=72052.0">buy</a> ]</font>
             <ul>
-                <li>TMK Converter(ATmega32U2): [ <a href="unimap/?next_usb">Full-key</a> ]
+                <li>TMK Converter(ATmega32U2): [ <a href="unimap/?next_usb_ng">Full-key</a> ] [ <a href="unimap/?next_usb_old">Old</a> ]
+                <li>DIY Converter(ATmega32U4): [ <a href="unimap/?next_usb_ng_32u4">Full-key</a> ]
             </ul>
         <li><a id="m0110_usb" href="#m0110_usb"></a>M0110-USB Converter <font size="1">[ <a href="https://geekhack.org/index.php?topic=24965.0">info</a> | <a href="https://github.com/tmk/tmk_keyboard/tree/master/converter/m0110_usb">code</a> | <a href="https://geekhack.org/index.php?topic=72052.0">buy</a> ]</font>
             <ul>
diff --git a/editor/unimap/config.js b/editor/unimap/config.js
index 4b5695dc69..365d4d076e 100644
--- a/editor/unimap/config.js
+++ b/editor/unimap/config.js
@@ -81,7 +81,19 @@ CONFIG = {
         /*
          * NeXT-USB
          */
-        next_usb: {
+        next_usb_ng: {
+            desc: "NeXT-USB Converter rev.2",
+            firmware_url: "https://raw.githubusercontent.com/tmk/tmk_keyboard/master/converter/next_usb_ng/binary/next_usb.hex",
+            firmware_format: "ihex",
+            layout: "layout-next_usb.html",
+        },
+        next_usb_ng_32u4: {
+            desc: "NeXT-USB Converter rev.2",
+            firmware_url: "https://raw.githubusercontent.com/tmk/tmk_keyboard/master/converter/next_usb_ng/binary/next_usb_atmega32u4.hex",
+            firmware_format: "ihex",
+            layout: "layout-next_usb.html",
+        },
+        next_usb_old: {
             desc: "NeXT-USB Converter rev.2",
             firmware_url: "https://raw.githubusercontent.com/tmk/tmk_keyboard/master/converter/next_usb/binary/next_usb_unimap.hex",
             firmware_format: "ihex",