diff --git a/config_comred.cmake b/config_comred.cmake
index ecb6c75..f88ed80 100644
--- a/config_comred.cmake
+++ b/config_comred.cmake
@@ -81,5 +81,5 @@ set(BOBBYCAR_BUILDFLAGS
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
     include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
+    message(WARNING "Including plugins")
 endif()
diff --git a/config_greyhash.cmake b/config_greyhash.cmake
index 9e70a30..22b9627 100644
--- a/config_greyhash.cmake
+++ b/config_greyhash.cmake
@@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
     include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
+    message(WARNING "Including plugins")
 endif()
diff --git a/config_mick.cmake b/config_mick.cmake
index 0d3578b..fba536b 100644
--- a/config_mick.cmake
+++ b/config_mick.cmake
@@ -74,5 +74,5 @@ set(BOBBYCAR_BUILDFLAGS
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
     include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
+    message(WARNING "Including plugins")
 endif()
diff --git a/config_peter.cmake b/config_peter.cmake
index e5b4e65..beff0e5 100644
--- a/config_peter.cmake
+++ b/config_peter.cmake
@@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
     include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
+    message(WARNING "Including plugins")
 endif()
diff --git a/config_seatbot.cmake b/config_seatbot.cmake
index e4e47e0..b16f286 100644
--- a/config_seatbot.cmake
+++ b/config_seatbot.cmake
@@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS
 
 #if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
 #    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-#    message(WARNING "Including lockscreen_plugin")
+#    message(WARNING "Including plugins")
 #endif()
diff --git a/ignore.tar.gz.gpg b/ignore.tar.gz.gpg
index efe3e5f..55ca9aa 100644
Binary files a/ignore.tar.gz.gpg and b/ignore.tar.gz.gpg differ
diff --git a/main/can.cpp b/main/can.cpp
index 788ee21..87401ce 100644
--- a/main/can.cpp
+++ b/main/can.cpp
@@ -373,12 +373,18 @@ void sendCanCommands()
         if (back) send(MotorController<true, true>::Command::Enable, back->command.right.enable);
         break;
     case 1:
+#ifdef HAS_SIMPLIFIED
+        SIMPLIFIED_CONTROLTYPE
+#endif
         if (front) send(MotorController<false, false>::Command::CtrlTyp, front->command.left.ctrlTyp);
         if (front) send(MotorController<false, true>::Command::CtrlTyp, front->command.right.ctrlTyp);
         if (back) send(MotorController<true, false>::Command::CtrlTyp, back->command.left.ctrlTyp);
         if (back) send(MotorController<true, true>::Command::CtrlTyp, back->command.right.ctrlTyp);
         break;
     case 2:
+#ifdef HAS_SIMPLIFIED
+        SIMPLIFIED_CONTROLMODE
+#endif
         if (front) send(MotorController<false, false>::Command::CtrlMod, front->command.left.ctrlMod);
         if (front) send(MotorController<false, true>::Command::CtrlMod, front->command.right.ctrlMod);
         if (back) send(MotorController<true, false>::Command::CtrlMod, back->command.left.ctrlMod);
@@ -386,7 +392,7 @@ void sendCanCommands()
         handbremse::finishedMotorUpdate = true;
         break;
     case 3:
-#if defined(HAS_SIMPLIFIED)
+#ifdef HAS_SIMPLIFIED
         SIMPLIFIED_IMOTMAX
 #endif
             if (front) send(MotorController<false, false>::Command::IMotMax, front->command.left.iMotMax);
@@ -395,7 +401,7 @@ void sendCanCommands()
             if (back) send(MotorController<true, true>::Command::IMotMax, back->command.right.iMotMax);
         break;
     case 4:
-#if defined(HAS_SIMPLIFIED)
+#ifdef HAS_SIMPLIFIED
         SIMPLIFIED_IDCMAX
 #endif
             if (front) send(MotorController<false, false>::Command::IDcMax, front->command.left.iDcMax);
@@ -404,7 +410,7 @@ void sendCanCommands()
             if (back) send(MotorController<true, true>::Command::IDcMax, back->command.right.iDcMax);
         break;
     case 5:
-#if defined(HAS_SIMPLIFIED)
+#ifdef HAS_SIMPLIFIED
         SIMPLIFIED_NMOTMAX
 #endif
             if (front) send(MotorController<false, false>::Command::NMotMax, front->command.left.nMotMax);
@@ -413,7 +419,7 @@ void sendCanCommands()
             if (back) send(MotorController<true, true>::Command::NMotMax, back->command.right.nMotMax);
         break;
     case 6:
-#if defined(HAS_SIMPLIFIED)
+#ifdef HAS_SIMPLIFIED
         SIMPLIFIED_FIELDWEAKMAX
 #endif
             if (front) send(MotorController<false, false>::Command::FieldWeakMax, front->command.left.fieldWeakMax);
diff --git a/main/can.h b/main/can.h
index e501dc3..4b23b03 100644
--- a/main/can.h
+++ b/main/can.h
@@ -9,7 +9,6 @@
 #include <espchrono.h>
 
 #ifdef CAN_PLUGIN
-#pragma message "Activating Can Plugin"
 #include CAN_PLUGIN
 #endif
 
diff --git a/main/displays/lockscreen.cpp b/main/displays/lockscreen.cpp
index 8fff86e..333e837 100644
--- a/main/displays/lockscreen.cpp
+++ b/main/displays/lockscreen.cpp
@@ -102,7 +102,6 @@ void Lockscreen::redraw()
                 else
                     espgui::switchScreen<MainMenu>();
 #ifdef LOCKSCREEN_PLUGIN
-#pragma message "Activating Lockscreen Plugin"
 #include LOCKSCREEN_PLUGIN
 #endif
                 return;
diff --git a/main/globals.cpp b/main/globals.cpp
index 58c2c15..e1d7f48 100644
--- a/main/globals.cpp
+++ b/main/globals.cpp
@@ -17,6 +17,10 @@ float avgSpeedKmh{};
 float sumCurrent{};
 bool isLocked{};
 
+#ifdef GLOBALS_SOURCE
+GLOBALS_SOURCE
+#endif
+
 bool simplified =
 #if defined(HAS_SIMPLIFIED)
     true
diff --git a/main/globals.h b/main/globals.h
index 838373b..ab12846 100644
--- a/main/globals.h
+++ b/main/globals.h
@@ -47,6 +47,7 @@ extern bool isLocked;
 
 #ifdef GLOBALS_PLUGIN
 #include GLOBALS_PLUGIN
+GLOBALS_HEADER
 #endif
 
 extern bool simplified;