From f6eab0f9ac6486a04f8ca3e240608aa32f868357 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Wed, 29 Jul 2020 16:19:29 -0700
Subject: [PATCH 01/27] Added a new handwired 2x3,2x4,2x5 keyboard called the
 Stream_cheap

stream cheap is a diy version of the El Gato Stream deck minus the LCD keys
but you can always get relegendable keycaps to change the icon if you want
---
 keyboards/handwired/stream_cheap/2x3/2x3.c    |  7 ++++
 keyboards/handwired/stream_cheap/2x3/2x3.h    | 11 +++++++
 keyboards/handwired/stream_cheap/2x3/config.h | 33 +++++++++++++++++++
 .../handwired/stream_cheap/2x3/info.json      | 20 +++++++++++
 .../stream_cheap/2x3/keymaps/default/keymap.c | 16 +++++++++
 keyboards/handwired/stream_cheap/2x3/rules.mk | 27 +++++++++++++++
 keyboards/handwired/stream_cheap/2x4/2x4.c    |  7 ++++
 keyboards/handwired/stream_cheap/2x4/2x4.h    | 12 +++++++
 keyboards/handwired/stream_cheap/2x4/config.h | 31 +++++++++++++++++
 .../handwired/stream_cheap/2x4/info.json      | 22 +++++++++++++
 .../stream_cheap/2x4/keymaps/default/keymap.c | 18 ++++++++++
 keyboards/handwired/stream_cheap/2x4/rules.mk | 27 +++++++++++++++
 keyboards/handwired/stream_cheap/2x5/2x5.c    |  7 ++++
 keyboards/handwired/stream_cheap/2x5/2x5.h    | 11 +++++++
 keyboards/handwired/stream_cheap/2x5/config.h | 30 +++++++++++++++++
 .../handwired/stream_cheap/2x5/info.json      | 24 ++++++++++++++
 .../stream_cheap/2x5/keymaps/default/keymap.c | 17 ++++++++++
 keyboards/handwired/stream_cheap/2x5/rules.mk | 27 +++++++++++++++
 keyboards/handwired/stream_cheap/config.h     | 25 ++++++++++++++
 keyboards/handwired/stream_cheap/readme.md    | 23 +++++++++++++
 20 files changed, 395 insertions(+)
 create mode 100644 keyboards/handwired/stream_cheap/2x3/2x3.c
 create mode 100644 keyboards/handwired/stream_cheap/2x3/2x3.h
 create mode 100644 keyboards/handwired/stream_cheap/2x3/config.h
 create mode 100644 keyboards/handwired/stream_cheap/2x3/info.json
 create mode 100644 keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/stream_cheap/2x3/rules.mk
 create mode 100644 keyboards/handwired/stream_cheap/2x4/2x4.c
 create mode 100644 keyboards/handwired/stream_cheap/2x4/2x4.h
 create mode 100644 keyboards/handwired/stream_cheap/2x4/config.h
 create mode 100644 keyboards/handwired/stream_cheap/2x4/info.json
 create mode 100644 keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/stream_cheap/2x4/rules.mk
 create mode 100644 keyboards/handwired/stream_cheap/2x5/2x5.c
 create mode 100644 keyboards/handwired/stream_cheap/2x5/2x5.h
 create mode 100644 keyboards/handwired/stream_cheap/2x5/config.h
 create mode 100644 keyboards/handwired/stream_cheap/2x5/info.json
 create mode 100644 keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/stream_cheap/2x5/rules.mk
 create mode 100644 keyboards/handwired/stream_cheap/config.h
 create mode 100644 keyboards/handwired/stream_cheap/readme.md

diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.c b/keyboards/handwired/stream_cheap/2x3/2x3.c
new file mode 100644
index 000000000000..aebbdc0738be
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/2x3.c
@@ -0,0 +1,7 @@
+#include "2x3.h"
+
+
+void matrix_init_kb(void)
+{
+    matrix_init_user();
+}
diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.h b/keyboards/handwired/stream_cheap/2x3/2x3.h
new file mode 100644
index 000000000000..ba985c1d51c2
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/2x3.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_2x3( \
+	K00, K01, K02, \
+	K03, K04, K05  \
+) { \
+	{ K00,   K01,   K02}, \
+	{ K03,   K04,   K05}  \
+}
diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h
new file mode 100644
index 000000000000..e5010c446eee
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/config.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1213
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Kyle Hart
+#define PRODUCT         stream_cheap
+#define DESCRIPTION     stream cheap
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+
+/* define direct pins used */
+#define DIRECT_PINS { { D1,C6,B4}, { D0,D4,D7} }
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Tap dancing params */
+#define TAPPING_TERM 250
+
+
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
new file mode 100644
index 000000000000..16538af35bb6
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -0,0 +1,20 @@
+{
+    "keyboard_name": "Stream Cheap 2x3",
+    "url": "https://www.thingiverse.com/thing:4497991",
+    "maintainer": "qmk",
+    "width": 3,
+    "height": 2,
+    "layouts": {
+        "LAYOUT_2x3": {
+			"key_count":6,
+            "layout": [
+                {"label":"K00", "x":0, "y":0},
+                {"label":"K01", "x":1, "y":0},
+                {"label":"K02", "x":2, "y":0},
+                {"label":"K03", "x":0, "y":1},
+                {"label":"K04", "x":1, "y":1},
+                {"label":"K05", "x":2, "y":1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..79d4dfae8bbb
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+  NORMAL_LAYER = 0,
+   SECOND_LAYER
+};
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [NORMAL_LAYER] = LAYOUT_2x3(KC_1, KC_2, KC_3,KC_4, KC_5, TO(1)),
+	[SECOND_LAYER]  = LAYOUT_2x3(KC_A, KC_B, KC_C,KC_D, KC_E, TO(0))
+};
+
+
diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk
new file mode 100644
index 000000000000..16b2a0854885
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x3/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+
+AUDIO_ENABLE = no
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
+COMMAND_ENABLE = no     # Commands for debug and configuration
+CONSOLE_ENABLE= no	# Console for debug
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+MOUSEKEY_ENABLE = yes	# Mouse keys
+NKRO_ENABLE = yes	# USB Nkey Rollover -
+
+RGBLIGHT_ENABLE = no
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+UNICODE_ENABLE = yes
+TAP_DANCE_ENABLE = no
diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.c b/keyboards/handwired/stream_cheap/2x4/2x4.c
new file mode 100644
index 000000000000..177c977e844d
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/2x4.c
@@ -0,0 +1,7 @@
+#include "2x4.h"
+
+
+void matrix_init_kb(void)
+{
+    matrix_init_user();
+}
diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.h b/keyboards/handwired/stream_cheap/2x4/2x4.h
new file mode 100644
index 000000000000..1f5940ab8350
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/2x4.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_2x4(\
+	K00, K01, K02,K03, \
+	K04, K05, K06,K07  \
+) \
+  { \
+    { K00,K01,K02,K03}, \
+	{ K04,K05,K06,K07}  \
+}
diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
new file mode 100644
index 000000000000..15f5757b9e82
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1213
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Kyle Hart
+#define PRODUCT         stream_cheap
+#define DESCRIPTION     stream cheap
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+/* define direct pins used */
+#define DIRECT_PINS { { D1,C6,B4,B5}, { D0,D4,D7,E6} }
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Tap dancing params */
+#define TAPPING_TERM 250
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
new file mode 100644
index 000000000000..9358eec7cd18
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -0,0 +1,22 @@
+{
+    "keyboard_name": "Stream Cheap 2x4",
+    "url": "https://www.thingiverse.com/thing:4497991",
+    "maintainer": "qmk",
+    "width": 4,
+    "height": 2,
+    "layouts": {
+        "LAYOUT_2x4": {
+			"key_count":8,
+            "layout": [
+                {"label":"K00", "x":0, "y":0},
+                {"label":"K01", "x":1, "y":0},
+                {"label":"K02", "x":2, "y":0},
+                {"label":"K02", "x":3, "y":0},
+                {"label":"K03", "x":0, "y":1},
+                {"label":"K04", "x":1, "y":1},
+                {"label":"K05", "x":2, "y":1}
+                {"label":"K05", "x":3, "y":1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
new file mode 100644
index 000000000000..b10ed12ae3c7
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+#include QMK_KEYBOARD_H
+
+
+enum layers {
+  NORMAL_LAYER = 0,
+  SECOND_LAYER
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [NORMAL_LAYER] = LAYOUT_2x4(KC_1, KC_2, KC_3, KC_4, 
+							KC_5, KC_6, KC_7, TO(1)),
+	[SECOND_LAYER] = LAYOUT_2x4(KC_A, KC_B, KC_C, KC_D, 
+							KC_E, KC_F, KC_G, TO(0))
+};
+
+
diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk
new file mode 100644
index 000000000000..16b2a0854885
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x4/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+
+AUDIO_ENABLE = no
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
+COMMAND_ENABLE = no     # Commands for debug and configuration
+CONSOLE_ENABLE= no	# Console for debug
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+MOUSEKEY_ENABLE = yes	# Mouse keys
+NKRO_ENABLE = yes	# USB Nkey Rollover -
+
+RGBLIGHT_ENABLE = no
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+UNICODE_ENABLE = yes
+TAP_DANCE_ENABLE = no
diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.c b/keyboards/handwired/stream_cheap/2x5/2x5.c
new file mode 100644
index 000000000000..b690582fb5b1
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/2x5.c
@@ -0,0 +1,7 @@
+#include "2x5.h"
+
+
+void matrix_init_kb(void)
+{
+    matrix_init_user();
+}
diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.h b/keyboards/handwired/stream_cheap/2x5/2x5.h
new file mode 100644
index 000000000000..bb2949e209ac
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/2x5.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_2x5( \
+	K00, K01, K02, K03, K04, \
+	K10, K11, K12, K13, K14  \
+) { \
+	{ K00,   K01,   K02,   K03,   K04 }, \
+	{ K10,   K11,   K12,   K13,   K14 }  \
+}
diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h
new file mode 100644
index 000000000000..37c5c3377374
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/config.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1213
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Kyle Hart
+#define PRODUCT         stream_cheap
+#define DESCRIPTION     stream cheap
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 5
+
+/* define direct pins used */
+#define DIRECT_PINS { { D1,C6,B4,B5,B2}, { D0,D4,D7,E6,B6} }
+//#define DIRECT_PINS { { D1, C6, B4, B6, D0}, { D7, D4, B2, B5, E6} }
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Tap dancing params */
+#define TAPPING_TERM 250
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
new file mode 100644
index 000000000000..762ab98ba07d
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Stream Cheap 2x5",
+    "url": "https://www.thingiverse.com/thing:4497991",
+    "maintainer": "qmk",
+    "width": 5,
+    "height": 2,
+    "layouts": {
+        "LAYOUT_2x5": {
+			"key_count":10,
+            "layout": [
+                {"label":"K00", "x":0, "y":0},
+                {"label":"K01", "x":1, "y":0},
+                {"label":"K02", "x":2, "y":0},
+                {"label":"K02", "x":3, "y":0},
+                {"label":"K02", "x":4, "y":0},
+                {"label":"K03", "x":0, "y":1},
+                {"label":"K04", "x":1, "y":1},
+                {"label":"K05", "x":2, "y":1}
+                {"label":"K05", "x":3, "y":1}
+                {"label":"K05", "x":4, "y":1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
new file mode 100644
index 000000000000..ecc45d9f04ce
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+
+enum layers {
+  NORMAL_LAYER = 0,
+  SECOND_LAYER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [NORMAL_LAYER] = LAYOUT_2x5(KC_1, KC_2, KC_3, KC_4, KC_5,
+							KC_6, KC_7, KC_8, KC_9, TO(1)),
+	[SECOND_LAYER] = LAYOUT_2x5(KC_A, KC_B, KC_C, KC_D, KC_E,
+							KC_F, KC_G, KC_H, KC_I,TO(0))
+};
+
+
diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk
new file mode 100644
index 000000000000..16b2a0854885
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/2x5/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+
+AUDIO_ENABLE = no
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
+COMMAND_ENABLE = no     # Commands for debug and configuration
+CONSOLE_ENABLE= no	# Console for debug
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+MOUSEKEY_ENABLE = yes	# Mouse keys
+NKRO_ENABLE = yes	# USB Nkey Rollover -
+
+RGBLIGHT_ENABLE = no
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+UNICODE_ENABLE = yes
+TAP_DANCE_ENABLE = no
diff --git a/keyboards/handwired/stream_cheap/config.h b/keyboards/handwired/stream_cheap/config.h
new file mode 100644
index 000000000000..0fdcbd1517e9
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/config.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1213
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Kyle Hart
+#define PRODUCT         stream_cheap
+#define DESCRIPTION     stream cheap
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Tap dancing params */
+#define TAPPING_TERM 250
+
diff --git a/keyboards/handwired/stream_cheap/readme.md b/keyboards/handwired/stream_cheap/readme.md
new file mode 100644
index 000000000000..f7223c1137f9
--- /dev/null
+++ b/keyboards/handwired/stream_cheap/readme.md
@@ -0,0 +1,23 @@
+# stream_cheap
+
+https://www.thingiverse.com/thing:4497991
+
+This stream cheap as its called on thingiverse
+
+Keyboard Maintainer: [qmk](https://github.com/qmk)  
+
+Hardware:
+  * 3d printed switch plate
+  * 10 key switches
+  * 3d printed case
+  * Handwired in direct pins mode (i.e. all switches share a common gnd and are wired to thier own pin)
+  * Uses a Pro Micro
+  * Includes a reset switch accessible by a hole on the bottom
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/stream_cheap/2x3:default
+    make handwired/stream_cheap/2x4:default
+    make handwired/stream_cheap/2x5:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

From 3eb13b897e129760a972e000e002ff110a6f78e6 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:04:55 -0700
Subject: [PATCH 02/27] added missing commas in info.json files

---
 keyboards/handwired/stream_cheap/2x3/info.json | 2 +-
 keyboards/handwired/stream_cheap/2x4/info.json | 4 ++--
 keyboards/handwired/stream_cheap/2x5/info.json | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 16538af35bb6..4c35eba1a12c 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -17,4 +17,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index 9358eec7cd18..688431df1efd 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -14,9 +14,9 @@
                 {"label":"K02", "x":3, "y":0},
                 {"label":"K03", "x":0, "y":1},
                 {"label":"K04", "x":1, "y":1},
-                {"label":"K05", "x":2, "y":1}
+                {"label":"K05", "x":2, "y":1},
                 {"label":"K05", "x":3, "y":1}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 762ab98ba07d..6ad704134c84 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -15,10 +15,10 @@
                 {"label":"K02", "x":4, "y":0},
                 {"label":"K03", "x":0, "y":1},
                 {"label":"K04", "x":1, "y":1},
-                {"label":"K05", "x":2, "y":1}
-                {"label":"K05", "x":3, "y":1}
+                {"label":"K05", "x":2, "y":1},
+                {"label":"K05", "x":3, "y":1},
                 {"label":"K05", "x":4, "y":1}
             ]
         }
     }
-}
\ No newline at end of file
+}

From 8a5b80576d3c5630ff697c208c3fb131dea0f924 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:20:03 -0700
Subject: [PATCH 03/27] update config to change pin definition

---
 keyboards/handwired/stream_cheap/2x4/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
index 15f5757b9e82..06b0a43297de 100644
--- a/keyboards/handwired/stream_cheap/2x4/config.h
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -15,7 +15,7 @@
 #define MATRIX_COLS 4
 
 /* define direct pins used */
-#define DIRECT_PINS { { D1,C6,B4,B5}, { D0,D4,D7,E6} }
+#define DIRECT_PINS { { B5,D7,C6,D1}, { B4,E6,D4,D0} }
 
 
 /* Set 0 if debouncing isn't needed */

From 06f9a068aec3a21456b2a710d576aceef640766b Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 00:21:43 -0700
Subject: [PATCH 04/27] changed keymap.c for 2x4

was trying to add macros and multi key commands to the keymap,

i added 2 ctrl commands that have more than one key i.e. ctrl-k-c (visual studio comment hot key)

and i added a test string to see how type out a string with the press of a button
---
 .../stream_cheap/2x4/keymaps/default/keymap.c | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
index b10ed12ae3c7..8affef27e35d 100644
--- a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
@@ -6,13 +6,38 @@ enum layers {
   SECOND_LAYER
 };
 
+enum custom_keycode {
+    VS_COMMENT = SAFE_RANGE,
+    VS_UNCOMMENT,
+    TST_STRING
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case VS_COMMENT:
+            if (record->event.pressed) {
+                SEND_STRING(SS_LCTL("kc"));
+            }
+            break;
+        case VS_UNCOMMENT:
+            if (record->event.pressed) {
+                SEND_STRING(SS_LCTL("ku"));
+            }
+            break;
+        case TST_STRING:
+            if (record->event.pressed) {
+                SEND_STRING("12345"SS_TAP(X_ENTER));
+            }
+            break;
 
+    }
+    return true;
+}
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [NORMAL_LAYER] = LAYOUT_2x4(KC_1, KC_2, KC_3, KC_4, 
+    [NORMAL_LAYER] = LAYOUT_2x4(VS_COMMENT, VS_UNCOMMENT, TST_STRING, KC_4,
 							KC_5, KC_6, KC_7, TO(1)),
-	[SECOND_LAYER] = LAYOUT_2x4(KC_A, KC_B, KC_C, KC_D, 
+	[SECOND_LAYER] = LAYOUT_2x4(KC_A, KC_B, KC_C, KC_D,
 							KC_E, KC_F, KC_G, TO(0))
 };
-
-

From 467166f9c7fdc1782c8332f1b49f97721ac3cfd9 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:11:44 -0700
Subject: [PATCH 05/27] testing more changes to the keymap to the 2x5

---
 .../stream_cheap/2x5/keymaps/default/keymap.c | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
index ecc45d9f04ce..8ad1656c6c85 100644
--- a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
@@ -1,17 +1,57 @@
 #include QMK_KEYBOARD_H
 
 
+enum custom_keycode {
+    VS_COMMENT = SAFE_RANGE,
+    VS_UNCOMMENT,
+    TST_STRING
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case VS_COMMENT:
+            if (record->event.pressed) {
+                SEND_STRING(SS_LCTL("kc"));
+            }
+            break;
+        case VS_UNCOMMENT:
+            if (record->event.pressed) {
+                SEND_STRING(SS_LCTL("ku"));
+            }
+            break;
+        case TST_STRING:
+            if (record->event.pressed) {
+                SEND_STRING("12345"SS_TAP(X_ENTER));
+            }
+            break;
+
+    }
+    return true;
+}
+
+#define LOCK LGUI(KC_L)
+#define CUT LCTL(KC_X)
+#define COPY LCTL(KC_C)
+#define PASTE LCTL(KC_V)
+#define FIND LCTL(KC_F)
+
 enum layers {
   NORMAL_LAYER = 0,
   SECOND_LAYER
+  // ,
+  // THIRD_LAYER
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [NORMAL_LAYER] = LAYOUT_2x5(KC_1, KC_2, KC_3, KC_4, KC_5,
-							KC_6, KC_7, KC_8, KC_9, TO(1)),
-	[SECOND_LAYER] = LAYOUT_2x5(KC_A, KC_B, KC_C, KC_D, KC_E,
-							KC_F, KC_G, KC_H, KC_I,TO(0))
+    [NORMAL_LAYER] = LAYOUT_2x5(VS_COMMENT, VS_UNCOMMENT, LOCK, TST_STRING, KC_F5,
+							                  KC_F9, KC_F10, KC_F11, KC_F12, TO(1)),
+	[SECOND_LAYER] = LAYOUT_2x5(KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP,
+							                CUT, COPY, PASTE, FIND,TO(0))
+              // ,
+	// [THIRD_LAYER] = LAYOUT_2x5(KC_Q, KC_W, KC_E, KC_R, KC_T,
+	// 						KC_Y, KC_U, KC_L, KC_P,TO(0))
 };
 
 

From 9e8eba4b4a355fdba547f7ca440816e5f54dc603 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:15:57 -0700
Subject: [PATCH 06/27] Update keyboards/handwired/stream_cheap/2x3/2x3.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x3/2x3.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.c b/keyboards/handwired/stream_cheap/2x3/2x3.c
index aebbdc0738be..688974787395 100644
--- a/keyboards/handwired/stream_cheap/2x3/2x3.c
+++ b/keyboards/handwired/stream_cheap/2x3/2x3.c
@@ -1,7 +1 @@
 #include "2x3.h"
-
-
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-}

From 4e5eafaba2cc6cc3dbd9b6f53dff1ad2a6998c4a Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:16:18 -0700
Subject: [PATCH 07/27] Update keyboards/handwired/stream_cheap/2x3/config.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x3/config.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h
index e5010c446eee..783d6eaf5b90 100644
--- a/keyboards/handwired/stream_cheap/2x3/config.h
+++ b/keyboards/handwired/stream_cheap/2x3/config.h
@@ -26,8 +26,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250
-
-

From 2506aa8eef330a109a258fbfb5715878ddf83f2e Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:16:32 -0700
Subject: [PATCH 08/27] Update keyboards/handwired/stream_cheap/2x3/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x3/rules.mk | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk
index 16b2a0854885..e4ffb10d0494 100644
--- a/keyboards/handwired/stream_cheap/2x3/rules.mk
+++ b/keyboards/handwired/stream_cheap/2x3/rules.mk
@@ -2,26 +2,21 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
-
-AUDIO_ENABLE = no
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
-COMMAND_ENABLE = no     # Commands for debug and configuration
-CONSOLE_ENABLE= no	# Console for debug
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-MOUSEKEY_ENABLE = yes	# Mouse keys
-NKRO_ENABLE = yes	# USB Nkey Rollover -
-
-RGBLIGHT_ENABLE = no
-SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = no
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

From 55323d5cb864329ff5c9e01e5e78866c21d28443 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:16:40 -0700
Subject: [PATCH 09/27] Update keyboards/handwired/stream_cheap/2x5/config.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x5/config.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h
index 37c5c3377374..cb7ec8c9aa7c 100644
--- a/keyboards/handwired/stream_cheap/2x5/config.h
+++ b/keyboards/handwired/stream_cheap/2x5/config.h
@@ -25,6 +25,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250

From bea5c076445ec858d834fe9c2ec5259f1329a028 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:17:13 -0700
Subject: [PATCH 10/27] Update keyboards/handwired/stream_cheap/2x5/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x5/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 6ad704134c84..bc15a8b37546 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -11,13 +11,13 @@
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},
                 {"label":"K02", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K02", "x":4, "y":0},
-                {"label":"K03", "x":0, "y":1},
-                {"label":"K04", "x":1, "y":1},
-                {"label":"K05", "x":2, "y":1},
-                {"label":"K05", "x":3, "y":1},
-                {"label":"K05", "x":4, "y":1}
+                {"label":"K03", "x":3, "y":0},
+                {"label":"K04", "x":4, "y":0},
+                {"label":"K10", "x":0, "y":1},
+                {"label":"K11", "x":1, "y":1},
+                {"label":"K12", "x":2, "y":1},
+                {"label":"K13", "x":3, "y":1},
+                {"label":"K14", "x":4, "y":1}
             ]
         }
     }

From 21932ef0676cb6e72628606c39edcffbba48336f Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:17:44 -0700
Subject: [PATCH 11/27] Update keyboards/handwired/stream_cheap/2x3/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x3/config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h
index 783d6eaf5b90..99ec2df34dfb 100644
--- a/keyboards/handwired/stream_cheap/2x3/config.h
+++ b/keyboards/handwired/stream_cheap/2x3/config.h
@@ -8,7 +8,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
 #define PRODUCT         stream_cheap
-#define DESCRIPTION     stream cheap
 
 /* key matrix size */
 #define MATRIX_ROWS 2

From 6ee196b0d3c2f86729f449f33c16b1d9fc6e3417 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:17:52 -0700
Subject: [PATCH 12/27] Update keyboards/handwired/stream_cheap/2x3/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x3/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 4c35eba1a12c..92a4ebadc730 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -6,7 +6,6 @@
     "height": 2,
     "layouts": {
         "LAYOUT_2x3": {
-			"key_count":6,
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},

From 7d9132f7da68e0d1dfd9d217a02cb1f4f7b9816b Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:01 -0700
Subject: [PATCH 13/27] Update keyboards/handwired/stream_cheap/2x4/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x4/config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
index 06b0a43297de..82841524fbd6 100644
--- a/keyboards/handwired/stream_cheap/2x4/config.h
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -8,7 +8,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
 #define PRODUCT         stream_cheap
-#define DESCRIPTION     stream cheap
 
 /* key matrix size */
 #define MATRIX_ROWS 2

From c4c9819619282be6bbaa2ec4dd519f9d091726b6 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:08 -0700
Subject: [PATCH 14/27] Update keyboards/handwired/stream_cheap/2x4/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x4/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index 688431df1efd..cfbba54ab37c 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -6,7 +6,6 @@
     "height": 2,
     "layouts": {
         "LAYOUT_2x4": {
-			"key_count":8,
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},

From e076f3426b9657c05c2cf81110e4fadc82d8e1fd Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:19 -0700
Subject: [PATCH 15/27] Update
 keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
index 8affef27e35d..63dbb56c7e99 100644
--- a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case TST_STRING:
             if (record->event.pressed) {
-                SEND_STRING("12345"SS_TAP(X_ENTER));
+                SEND_STRING("12345\n");
             }
             break;
 

From 16b15c587ba3d9ceedf2b83a150389ca007eff68 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:26 -0700
Subject: [PATCH 16/27] Update keyboards/handwired/stream_cheap/2x5/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x5/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index bc15a8b37546..0058bf070f32 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -6,7 +6,6 @@
     "height": 2,
     "layouts": {
         "LAYOUT_2x5": {
-			"key_count":10,
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},

From c925006b2d6651924a63c950129c421d0dd4f5da Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:33 -0700
Subject: [PATCH 17/27] Update keyboards/handwired/stream_cheap/2x5/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x5/config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h
index cb7ec8c9aa7c..3236db1ea9d4 100644
--- a/keyboards/handwired/stream_cheap/2x5/config.h
+++ b/keyboards/handwired/stream_cheap/2x5/config.h
@@ -8,7 +8,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
 #define PRODUCT         stream_cheap
-#define DESCRIPTION     stream cheap
 
 /* key matrix size */
 #define MATRIX_ROWS 2

From f57fb700a41b1c672c54d8b277f931556de24553 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:42 -0700
Subject: [PATCH 18/27] Update keyboards/handwired/stream_cheap/2x5/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x5/rules.mk | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk
index 16b2a0854885..d89c548b1d47 100644
--- a/keyboards/handwired/stream_cheap/2x5/rules.mk
+++ b/keyboards/handwired/stream_cheap/2x5/rules.mk
@@ -1,27 +1,23 @@
 # MCU name
 MCU = atmega32u4
 
+```suggestion
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
-
-AUDIO_ENABLE = no
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
-COMMAND_ENABLE = no     # Commands for debug and configuration
-CONSOLE_ENABLE= no	# Console for debug
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-MOUSEKEY_ENABLE = yes	# Mouse keys
-NKRO_ENABLE = yes	# USB Nkey Rollover -
-
-RGBLIGHT_ENABLE = no
-SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = no
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

From 395d205baebbeb4bf802d10c59914ce3a922b1a9 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:18:57 -0700
Subject: [PATCH 19/27] Update keyboards/handwired/stream_cheap/2x4/2x4.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x4/2x4.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.c b/keyboards/handwired/stream_cheap/2x4/2x4.c
index 177c977e844d..a0519d21b761 100644
--- a/keyboards/handwired/stream_cheap/2x4/2x4.c
+++ b/keyboards/handwired/stream_cheap/2x4/2x4.c
@@ -1,7 +1 @@
 #include "2x4.h"
-
-
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-}

From 9d26ee354fb15215839ad24cddaa5d0d82fcd478 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:19:11 -0700
Subject: [PATCH 20/27] Update keyboards/handwired/stream_cheap/2x4/config.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x4/config.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
index 82841524fbd6..b9b660e55271 100644
--- a/keyboards/handwired/stream_cheap/2x4/config.h
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -25,6 +25,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250

From 05372f44dbc6105b868c733038b7b2abe2a3685a Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:19:21 -0700
Subject: [PATCH 21/27] Update keyboards/handwired/stream_cheap/2x4/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x4/info.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index cfbba54ab37c..be86a9d0e3cf 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -10,11 +10,11 @@
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},
                 {"label":"K02", "x":2, "y":0},
-                {"label":"K02", "x":3, "y":0},
-                {"label":"K03", "x":0, "y":1},
-                {"label":"K04", "x":1, "y":1},
-                {"label":"K05", "x":2, "y":1},
-                {"label":"K05", "x":3, "y":1}
+                {"label":"K03", "x":3, "y":0},
+                {"label":"K04", "x":0, "y":1},
+                {"label":"K05", "x":1, "y":1},
+                {"label":"K06", "x":2, "y":1},
+                {"label":"K07", "x":3, "y":1}
             ]
         }
     }

From 8998e71341663e568b490baf3a84d054dc842c66 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:19:28 -0700
Subject: [PATCH 22/27] Update keyboards/handwired/stream_cheap/2x5/2x5.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x5/2x5.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.c b/keyboards/handwired/stream_cheap/2x5/2x5.c
index b690582fb5b1..70969a316afe 100644
--- a/keyboards/handwired/stream_cheap/2x5/2x5.c
+++ b/keyboards/handwired/stream_cheap/2x5/2x5.c
@@ -1,7 +1 @@
 #include "2x5.h"
-
-
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-}

From 59585c9dac23ac9332ad9d4230121e01a8d57655 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:19:39 -0700
Subject: [PATCH 23/27] Update keyboards/handwired/stream_cheap/2x4/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/handwired/stream_cheap/2x4/rules.mk | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk
index 16b2a0854885..e4ffb10d0494 100644
--- a/keyboards/handwired/stream_cheap/2x4/rules.mk
+++ b/keyboards/handwired/stream_cheap/2x4/rules.mk
@@ -2,26 +2,21 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
-
-AUDIO_ENABLE = no
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
-COMMAND_ENABLE = no     # Commands for debug and configuration
-CONSOLE_ENABLE= no	# Console for debug
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-MOUSEKEY_ENABLE = yes	# Mouse keys
-NKRO_ENABLE = yes	# USB Nkey Rollover -
-
-RGBLIGHT_ENABLE = no
-SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = no
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

From c6b7ff15d9d78abb0ca93c26a9639e8293f3a63b Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:21:17 -0700
Subject: [PATCH 24/27] removed file as per request of user @zvecr

---
 keyboards/handwired/stream_cheap/config.h | 25 -----------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 keyboards/handwired/stream_cheap/config.h

diff --git a/keyboards/handwired/stream_cheap/config.h b/keyboards/handwired/stream_cheap/config.h
deleted file mode 100644
index 0fdcbd1517e9..000000000000
--- a/keyboards/handwired/stream_cheap/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1213
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Kyle Hart
-#define PRODUCT         stream_cheap
-#define DESCRIPTION     stream cheap
-
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250
-

From 03957cba1cd2e34957bb425fceae0e8d9aed4570 Mon Sep 17 00:00:00 2001
From: hartk1213 <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:27:34 -0700
Subject: [PATCH 25/27] removed line in rules.mk for 2x5

---
 keyboards/handwired/stream_cheap/2x5/rules.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk
index d89c548b1d47..e4ffb10d0494 100644
--- a/keyboards/handwired/stream_cheap/2x5/rules.mk
+++ b/keyboards/handwired/stream_cheap/2x5/rules.mk
@@ -1,7 +1,6 @@
 # MCU name
 MCU = atmega32u4
 
-```suggestion
 # Bootloader selection
 BOOTLOADER = caterina
 

From f89f7f89b3e06ddca22ade143e9749cf55854107 Mon Sep 17 00:00:00 2001
From: Kyle <12398294+hartk1213@users.noreply.github.com>
Date: Thu, 30 Jul 2020 21:06:32 -0700
Subject: [PATCH 26/27] Update
 keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
index 8ad1656c6c85..2e2d92e1d348 100644
--- a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             break;
         case TST_STRING:
             if (record->event.pressed) {
-                SEND_STRING("12345"SS_TAP(X_ENTER));
+                SEND_STRING("12345\n");
             }
             break;
 
@@ -54,4 +54,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// 						KC_Y, KC_U, KC_L, KC_P,TO(0))
 };
 
-

From 1994059abbe2d8bc02914f799626dd0dd29a3c1f Mon Sep 17 00:00:00 2001
From: Kyle <12398294+hartk1213@users.noreply.github.com>
Date: Fri, 31 Jul 2020 14:30:49 -0700
Subject: [PATCH 27/27] Apply suggestions from code review

changes suggested in code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/handwired/stream_cheap/2x3/2x3.h    |  2 +-
 keyboards/handwired/stream_cheap/2x3/config.h |  2 +-
 .../handwired/stream_cheap/2x3/info.json      |  2 +-
 .../stream_cheap/2x3/keymaps/default/keymap.c | 11 +++++++---
 keyboards/handwired/stream_cheap/2x4/2x4.h    |  2 +-
 keyboards/handwired/stream_cheap/2x4/config.h |  4 ++--
 .../handwired/stream_cheap/2x4/info.json      |  2 +-
 .../stream_cheap/2x4/keymaps/default/keymap.c | 13 ++++++-----
 keyboards/handwired/stream_cheap/2x5/2x5.h    |  2 +-
 keyboards/handwired/stream_cheap/2x5/config.h |  4 ++--
 .../handwired/stream_cheap/2x5/info.json      |  2 +-
 .../stream_cheap/2x5/keymaps/default/keymap.c | 22 +++++++++++--------
 keyboards/handwired/stream_cheap/readme.md    | 16 +++++++-------
 13 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/keyboards/handwired/stream_cheap/2x3/2x3.h b/keyboards/handwired/stream_cheap/2x3/2x3.h
index ba985c1d51c2..12e9a460966a 100644
--- a/keyboards/handwired/stream_cheap/2x3/2x3.h
+++ b/keyboards/handwired/stream_cheap/2x3/2x3.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_2x3( \
+#define LAYOUT_ortho_2x3( \
 	K00, K01, K02, \
 	K03, K04, K05  \
 ) { \
diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h
index 99ec2df34dfb..a142ec4a4e1e 100644
--- a/keyboards/handwired/stream_cheap/2x3/config.h
+++ b/keyboards/handwired/stream_cheap/2x3/config.h
@@ -7,7 +7,7 @@
 #define PRODUCT_ID      0x1213
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
-#define PRODUCT         stream_cheap
+#define PRODUCT         Stream Cheap 2x3
 
 /* key matrix size */
 #define MATRIX_ROWS 2
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 92a4ebadc730..cdf5e1392fba 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -5,7 +5,7 @@
     "width": 3,
     "height": 2,
     "layouts": {
-        "LAYOUT_2x3": {
+        "LAYOUT_ortho_2x3": {
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},
diff --git a/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
index 79d4dfae8bbb..5ef589f6a320 100644
--- a/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x3/keymaps/default/keymap.c
@@ -9,8 +9,13 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [NORMAL_LAYER] = LAYOUT_2x3(KC_1, KC_2, KC_3,KC_4, KC_5, TO(1)),
-	[SECOND_LAYER]  = LAYOUT_2x3(KC_A, KC_B, KC_C,KC_D, KC_E, TO(0))
+    [NORMAL_LAYER] = LAYOUT_ortho_2x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, TO(1)
+    ),
+    [SECOND_LAYER] = LAYOUT_ortho_2x3(
+        KC_A, KC_B, KC_C,
+        KC_D, KC_E, TO(0)
+    )
 };
 
-
diff --git a/keyboards/handwired/stream_cheap/2x4/2x4.h b/keyboards/handwired/stream_cheap/2x4/2x4.h
index 1f5940ab8350..07856044f24b 100644
--- a/keyboards/handwired/stream_cheap/2x4/2x4.h
+++ b/keyboards/handwired/stream_cheap/2x4/2x4.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_2x4(\
+#define LAYOUT_ortho_2x4(\
 	K00, K01, K02,K03, \
 	K04, K05, K06,K07  \
 ) \
diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
index b9b660e55271..14b4d9e36845 100644
--- a/keyboards/handwired/stream_cheap/2x4/config.h
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -4,10 +4,10 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1213
+#define PRODUCT_ID      0x1214
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
-#define PRODUCT         stream_cheap
+#define PRODUCT         Stream Cheap 2x4
 
 /* key matrix size */
 #define MATRIX_ROWS 2
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index be86a9d0e3cf..ef495dbf6feb 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -5,7 +5,7 @@
     "width": 4,
     "height": 2,
     "layouts": {
-        "LAYOUT_2x4": {
+        "LAYOUT_ortho_2x4": {
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},
diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
index 63dbb56c7e99..541642f9594a 100644
--- a/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x4/keymaps/default/keymap.c
@@ -35,9 +35,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [NORMAL_LAYER] = LAYOUT_2x4(VS_COMMENT, VS_UNCOMMENT, TST_STRING, KC_4,
-							KC_5, KC_6, KC_7, TO(1)),
-	[SECOND_LAYER] = LAYOUT_2x4(KC_A, KC_B, KC_C, KC_D,
-							KC_E, KC_F, KC_G, TO(0))
+    [NORMAL_LAYER] = LAYOUT_ortho_2x4(
+        VS_COMMENT, VS_UNCOMMENT, TST_STRING, KC_4,
+        KC_5,       KC_6,         KC_7,       TO(1)
+    ),
+    [SECOND_LAYER] = LAYOUT_ortho_2x4(
+        KC_A, KC_B, KC_C, KC_D,
+        KC_E, KC_F, KC_G, TO(0)
+    )
 };
diff --git a/keyboards/handwired/stream_cheap/2x5/2x5.h b/keyboards/handwired/stream_cheap/2x5/2x5.h
index bb2949e209ac..f01c8302a25c 100644
--- a/keyboards/handwired/stream_cheap/2x5/2x5.h
+++ b/keyboards/handwired/stream_cheap/2x5/2x5.h
@@ -2,7 +2,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_2x5( \
+#define LAYOUT_ortho_2x5( \
 	K00, K01, K02, K03, K04, \
 	K10, K11, K12, K13, K14  \
 ) { \
diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h
index 3236db1ea9d4..cd69c632f1fb 100644
--- a/keyboards/handwired/stream_cheap/2x5/config.h
+++ b/keyboards/handwired/stream_cheap/2x5/config.h
@@ -4,10 +4,10 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1213
+#define PRODUCT_ID      0x1215
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kyle Hart
-#define PRODUCT         stream_cheap
+#define PRODUCT         Stream Cheap 2x5
 
 /* key matrix size */
 #define MATRIX_ROWS 2
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 0058bf070f32..9fd4b054fdb0 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -5,7 +5,7 @@
     "width": 5,
     "height": 2,
     "layouts": {
-        "LAYOUT_2x5": {
+        "LAYOUT_ortho_2x5": {
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},
diff --git a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
index 2e2d92e1d348..6d140a87800d 100644
--- a/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/stream_cheap/2x5/keymaps/default/keymap.c
@@ -44,13 +44,17 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [NORMAL_LAYER] = LAYOUT_2x5(VS_COMMENT, VS_UNCOMMENT, LOCK, TST_STRING, KC_F5,
-							                  KC_F9, KC_F10, KC_F11, KC_F12, TO(1)),
-	[SECOND_LAYER] = LAYOUT_2x5(KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP,
-							                CUT, COPY, PASTE, FIND,TO(0))
-              // ,
-	// [THIRD_LAYER] = LAYOUT_2x5(KC_Q, KC_W, KC_E, KC_R, KC_T,
-	// 						KC_Y, KC_U, KC_L, KC_P,TO(0))
+    [NORMAL_LAYER] = LAYOUT_ortho_2x5(
+        VS_COMMENT, VS_UNCOMMENT, LOCK, TST_STRING, KC_F5,
+        KC_F9, KC_F10, KC_F11, KC_F12, TO(1)
+    ),
+    [SECOND_LAYER] = LAYOUT_ortho_2x5(
+        KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MSTP,
+        CUT,     COPY,    PASTE,   FIND,    TO(0)
+    )
+    // ,
+    // [THIRD_LAYER] = LAYOUT_ortho_2x5(
+    //      KC_Q, KC_W, KC_E, KC_R, KC_T,
+    //      KC_Y, KC_U, KC_L, KC_P, TO(0)
+    // )
 };
-
diff --git a/keyboards/handwired/stream_cheap/readme.md b/keyboards/handwired/stream_cheap/readme.md
index f7223c1137f9..1b4d77ea9f4a 100644
--- a/keyboards/handwired/stream_cheap/readme.md
+++ b/keyboards/handwired/stream_cheap/readme.md
@@ -1,19 +1,19 @@
-# stream_cheap
+# Stream Cheap
 
-https://www.thingiverse.com/thing:4497991
-
-This stream cheap as its called on thingiverse
-
-Keyboard Maintainer: [qmk](https://github.com/qmk)  
+An ortholinear macropad, available in 2x3, 2x4, and 2x5 sizes.
 
 Hardware:
   * 3d printed switch plate
-  * 10 key switches
+  * 6-10 key switches
   * 3d printed case
-  * Handwired in direct pins mode (i.e. all switches share a common gnd and are wired to thier own pin)
+  * Handwired in Direct Pins mode (i.e. all switches share a common GND and are wired to their own pin)
   * Uses a Pro Micro
   * Includes a reset switch accessible by a hole on the bottom
 
+* Keyboard Maintainer: [hartk1213](https://github.com/hartk1213)
+* Hardware Supported: Pro Micro
+* Hardware Availability: [Thingiverse](https://www.thingiverse.com/thing:4497991)
+
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/stream_cheap/2x3:default