diff --git a/app/boards/shields/mokulua/Kconfig.shield b/app/boards/shields/mokulua/Kconfig.shield
index fbd59606..61b448d9 100644
--- a/app/boards/shields/mokulua/Kconfig.shield
+++ b/app/boards/shields/mokulua/Kconfig.shield
@@ -1,4 +1,4 @@
-#Copyright (c) 2022 Kyle McCreery
+#Copyright (c) 2022 The ZMK Contributors
 #SPDX-License-Identifier: MIT
 
 config SHIELD_MOKULUA_LEFT
diff --git a/app/boards/shields/mokulua/boards/nice_nano.overlay b/app/boards/shields/mokulua/boards/nice_nano.overlay
index b663d8aa..f16dc57a 100644
--- a/app/boards/shields/mokulua/boards/nice_nano.overlay
+++ b/app/boards/shields/mokulua/boards/nice_nano.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/mokulua/boards/nice_nano_v2.overlay b/app/boards/shields/mokulua/boards/nice_nano_v2.overlay
index b663d8aa..f16dc57a 100644
--- a/app/boards/shields/mokulua/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/mokulua/boards/nice_nano_v2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/mokulua/mokulua.conf b/app/boards/shields/mokulua/mokulua.conf
index 70e3aa11..759628a0 100644
--- a/app/boards/shields/mokulua/mokulua.conf
+++ b/app/boards/shields/mokulua/mokulua.conf
@@ -3,12 +3,12 @@
 # CONFIG_SENSOR_LOG_LEVEL_DBG=y
 
 # Uncomment both to enable encoder
-CONFIG_EC11=y
-CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+# CONFIG_EC11=y
+# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Uncomment the following lines to enable the Mokulua RGB Underglow
 # CONFIG_ZMK_RGB_UNDERGLOW=y
 
 # Uncomment the following line to enable the Mokulua OLED Display
-CONFIG_ZMK_DISPLAY=y
-CONFIG_ZMK_WIDGET_LAYER_STATUS=y
\ No newline at end of file
+# CONFIG_ZMK_DISPLAY=y
+# CONFIG_ZMK_WIDGET_LAYER_STATUS=y
\ No newline at end of file
diff --git a/app/boards/shields/mokulua/mokulua.dtsi b/app/boards/shields/mokulua/mokulua.dtsi
index efc4ce5c..45943554 100644
--- a/app/boards/shields/mokulua/mokulua.dtsi
+++ b/app/boards/shields/mokulua/mokulua.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/mokulua/mokulua.keymap b/app/boards/shields/mokulua/mokulua.keymap
index 15f645f6..fe05da2a 100644
--- a/app/boards/shields/mokulua/mokulua.keymap
+++ b/app/boards/shields/mokulua/mokulua.keymap
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/mokulua/mokulua_left.conf b/app/boards/shields/mokulua/mokulua_left.conf
index 70e3aa11..e69de29b 100644
--- a/app/boards/shields/mokulua/mokulua_left.conf
+++ b/app/boards/shields/mokulua/mokulua_left.conf
@@ -1,14 +0,0 @@
-# Uncomment to turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_SENSOR_LOG_LEVEL_DBG=y
-
-# Uncomment both to enable encoder
-CONFIG_EC11=y
-CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
-
-# Uncomment the following lines to enable the Mokulua RGB Underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-
-# Uncomment the following line to enable the Mokulua OLED Display
-CONFIG_ZMK_DISPLAY=y
-CONFIG_ZMK_WIDGET_LAYER_STATUS=y
\ No newline at end of file
diff --git a/app/boards/shields/mokulua/mokulua_left.overlay b/app/boards/shields/mokulua/mokulua_left.overlay
index 7ddd8ca8..9ac054e4 100644
--- a/app/boards/shields/mokulua/mokulua_left.overlay
+++ b/app/boards/shields/mokulua/mokulua_left.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/mokulua/mokulua_right.conf b/app/boards/shields/mokulua/mokulua_right.conf
index 70e3aa11..e69de29b 100644
--- a/app/boards/shields/mokulua/mokulua_right.conf
+++ b/app/boards/shields/mokulua/mokulua_right.conf
@@ -1,14 +0,0 @@
-# Uncomment to turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_SENSOR_LOG_LEVEL_DBG=y
-
-# Uncomment both to enable encoder
-CONFIG_EC11=y
-CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
-
-# Uncomment the following lines to enable the Mokulua RGB Underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-
-# Uncomment the following line to enable the Mokulua OLED Display
-CONFIG_ZMK_DISPLAY=y
-CONFIG_ZMK_WIDGET_LAYER_STATUS=y
\ No newline at end of file
diff --git a/app/boards/shields/mokulua/mokulua_right.overlay b/app/boards/shields/mokulua/mokulua_right.overlay
index bfe77d04..64a1b769 100644
--- a/app/boards/shields/mokulua/mokulua_right.overlay
+++ b/app/boards/shields/mokulua/mokulua_right.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Kyle McCreery
+ * Copyright (c) 2022 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */