diff --git a/keyboards/euclid36/config.h b/keyboards/euclid36/config.h
index 936e1cca85..3a65960a89 100644
--- a/keyboards/euclid36/config.h
+++ b/keyboards/euclid36/config.h
@@ -76,7 +76,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A {B6 , C6}
 #define ENCODERS_PAD_B {B4 , B5}
 
-#define ENCODER_RESOLUTIONS { 4, 4, 4, 1}
+#define ENCODER_RESOLUTION 1
+// Per encoder settings
+//#define ENCODER_RESOLUTIONS { 4, 4 }
 
 #ifdef THUMBSTICK_ENABLE
 #    define THUMBSTICK_FLIP_X
diff --git a/users/sadekbaroudi/process_records.h b/users/sadekbaroudi/process_records.h
index ae1211ce59..4614077c99 100755
--- a/users/sadekbaroudi/process_records.h
+++ b/users/sadekbaroudi/process_records.h
@@ -12,21 +12,17 @@ enum userspace_custom_keycodes {
     KC_RGB_T,                       // Toggles RGB Layer Indication mode
     KC_RGB_BLT,                     // Toggles RGB Base Layer Override mode
     RGB_IDL,                        // RGB Idling animations
-    KC_MAKE,                        // Run keyboard's customized make command
-    L_GREP,
-    L_FIND,
-    L_GITCOMMIT,
-    P_ANGBRKT,
-    P_PAREN,
-    P_CURLY,
-    P_BRKT,
-    E_ROBOT,
-    E_CAT,
-    KC_SECRET_1,                    // test1
-    KC_SECRET_2,                    // test2
-    KC_SECRET_3,                    // test3
-    KC_SECRET_4,                    // test4
-    KC_SECRET_5,                    // test5
+    // UNCOMMENT TO REENABLE MACROS
+    // KC_MAKE,                        // Run keyboard's customized make command
+    // L_GREP,
+    // L_FIND,
+    // L_GITCOMMIT,
+    // P_ANGBRKT,
+    // P_PAREN,
+    // P_CURLY,
+    // P_BRKT,
+    // E_ROBOT,
+    // E_CAT,
     NEW_SAFE_RANGE                  // use "NEWPLACEHOLDER for keymap specific codes
 };
 
diff --git a/users/sadekbaroudi/rules.mk b/users/sadekbaroudi/rules.mk
index 25d7d9c9a1..661f072c96 100755
--- a/users/sadekbaroudi/rules.mk
+++ b/users/sadekbaroudi/rules.mk
@@ -9,6 +9,7 @@ SWAP_HANDS_ENABLE= no  # Allow swapping hands of keyboard
 MOUSEKEY_ENABLE = yes
 BACKLIGHT_ENABLE = no
 NKRO_ENABLE      = no
+ENCODER_ENABLE = yes
 
 EXTRAFLAGS     += -flto
 
diff --git a/users/sadekbaroudi/sadekbaroudi.c b/users/sadekbaroudi/sadekbaroudi.c
index 569c2a5915..97d2f17439 100755
--- a/users/sadekbaroudi/sadekbaroudi.c
+++ b/users/sadekbaroudi/sadekbaroudi.c
@@ -133,7 +133,9 @@ void eeconfig_init_user(void) {
     userspace_config.raw              = 0;
     userspace_config.rgb_base_layer_override = false;
     userspace_config.rgb_layer_change = true;
+    #ifdef RGBLIGHT_ENABLE
     userspace_config.mode = RGBLIGHT_MODE_STATIC_LIGHT;
+    #endif
     userspace_config.hue = 167; // BLUE
     userspace_config.sat = 255;
     userspace_config.val = 255;
diff --git a/users/sadekbaroudi/wrappers.h b/users/sadekbaroudi/wrappers.h
index e88b157fc0..dcb1785bd5 100755
--- a/users/sadekbaroudi/wrappers.h
+++ b/users/sadekbaroudi/wrappers.h
@@ -133,8 +133,15 @@ NOTE: These are all the same length.  If you do a search/replace
 #define __________________MOUSE_2__________________			KC_MS_WH_LEFT,         KC_MS_LEFT,            KC_MS_DOWN,            KC_MS_RIGHT,           KC_MS_WH_RIGHT
 #define __________________MOUSE_3__________________			KC_MS_ACCEL0,          KC_MS_ACCEL1,          KC_MS_ACCEL2,          _______,               _______
 
-#define _________________MACROS_1__________________			VRSN,                  L_FIND,                L_GITCOMMIT,           _______,               E_ROBOT
-#define _________________MACROS_2__________________			P_ANGBRKT,             P_PAREN,               P_CURLY,               P_BRKT,                _______
-#define _________________MACROS_3__________________			KC_MAKE,               L_GREP,                _______,               _______,               E_CAT
+
+// COMMENT TO REENABLE MACROS
+#define _________________MACROS_1__________________			___________________BLANK___________________
+#define _________________MACROS_2__________________			___________________BLANK___________________
+#define _________________MACROS_3__________________			___________________BLANK___________________
+
+// UNCOMMENT TO REENABLE MACROS
+// #define _________________MACROS_1__________________			VRSN,                  L_FIND,                L_GITCOMMIT,           _______,               E_ROBOT
+// #define _________________MACROS_2__________________			P_ANGBRKT,             P_PAREN,               P_CURLY,               P_BRKT,                _______
+// #define _________________MACROS_3__________________			KC_MAKE,               L_GREP,                _______,               _______,               E_CAT
 
 // clang-format on