diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5dc46e6b3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
\ No newline at end of file
diff --git a/bin/regen-protos.bat b/bin/regen-protos.bat
index 29f35d0ae..8edebcf7c 100644
--- a/bin/regen-protos.bat
+++ b/bin/regen-protos.bat
@@ -1 +1,5 @@
-cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated\meshtastic -I=..\protobufs meshtastic\*.proto
+cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\protobufs ..\protobufs\meshtastic\*.proto
+
+cd ../src/mesh/generated/meshtastic
+sed -i 's/#include "meshtastic/#include "./g' *
+sed -i 's/meshtastic_//g' *
diff --git a/protobufs b/protobufs
index aaa6e08b2..8f711476f 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit aaa6e08b2e00127d4396f3a994cede4a749cff9c
+Subproject commit 8f711476fc866faf111181b0148cf069d9fceaba
diff --git a/src/ButtonThread.h b/src/ButtonThread.h
index d94b6a769..5bb856027 100644
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -115,8 +115,7 @@ class ButtonThread : public concurrency::OSThread
     {
         // LOG_DEBUG("press!\n");
 #ifdef BUTTON_PIN
-        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) ||
-            !moduleConfig.canned_message.enabled) {
+        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) || !moduleConfig.canned_message.enabled) {
             powerFSM.trigger(EVENT_PRESS);
         }
 #endif
@@ -144,10 +143,10 @@ class ButtonThread : public concurrency::OSThread
 #ifdef PIN_LED1
                 ledOff(PIN_LED1);
 #endif
-#ifdef PIN_LED2        
+#ifdef PIN_LED2
                 ledOff(PIN_LED2);
 #endif
-#ifdef PIN_LED3        
+#ifdef PIN_LED3
                 ledOff(PIN_LED3);
 #endif
                 shutdown_on_long_stop = true;
@@ -160,28 +159,25 @@ class ButtonThread : public concurrency::OSThread
 
     static void userButtonDoublePressed()
     {
-    #if defined(USE_EINK) && defined(PIN_EINK_EN)
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
-    #endif
-    #if defined(GPS_POWER_TOGGLE)
-        if(config.position.gps_enabled)
-        {
-        LOG_DEBUG("Flag set to false for gps power\n");
-        } 
-        else 
-        {
-        LOG_DEBUG("Flag set to true to restore power\n");
-        }
-    config.position.gps_enabled = !(config.position.gps_enabled);
-    doGPSpowersave(config.position.gps_enabled);
-    #endif
+#endif
+        screen->print("Sent ad-hoc ping\n");
+        service.refreshMyNodeInfo();
+        service.sendNetworkPing(NODENUM_BROADCAST, true);
     }
 
     static void userButtonMultiPressed()
     {
-        screen->print("Sent ad-hoc ping\n");
-        service.refreshMyNodeInfo();
-        service.sendNetworkPing(NODENUM_BROADCAST, true);
+#if defined(GPS_POWER_TOGGLE)
+        if (config.position.gps_enabled) {
+            LOG_DEBUG("Flag set to false for gps power\n");
+        } else {
+            LOG_DEBUG("Flag set to true to restore power\n");
+        }
+        config.position.gps_enabled = !(config.position.gps_enabled);
+        doGPSpowersave(config.position.gps_enabled);
+#endif
     }
 
     static void userButtonPressedLongStart()
diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
index f49c330d9..54edfe65d 100644
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -105,7 +105,9 @@ typedef enum _Config_DisplayConfig_OledType {
     /* Default / Auto */
     Config_DisplayConfig_OledType_OLED_SSD1306 = 1,
     /* Default / Auto */
-    Config_DisplayConfig_OledType_OLED_SH1106 = 2
+    Config_DisplayConfig_OledType_OLED_SH1106 = 2,
+    /* Can not be auto detected but set by proto. Used for 128x128 screens */
+    Config_DisplayConfig_OledType_OLED_SH1107 = 3
 } Config_DisplayConfig_OledType;
 
 typedef enum _Config_DisplayConfig_DisplayMode {
@@ -435,8 +437,8 @@ extern "C" {
 #define _Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((Config_DisplayConfig_DisplayUnits)(Config_DisplayConfig_DisplayUnits_IMPERIAL+1))
 
 #define _Config_DisplayConfig_OledType_MIN Config_DisplayConfig_OledType_OLED_AUTO
-#define _Config_DisplayConfig_OledType_MAX Config_DisplayConfig_OledType_OLED_SH1106
-#define _Config_DisplayConfig_OledType_ARRAYSIZE ((Config_DisplayConfig_OledType)(Config_DisplayConfig_OledType_OLED_SH1106+1))
+#define _Config_DisplayConfig_OledType_MAX Config_DisplayConfig_OledType_OLED_SH1107
+#define _Config_DisplayConfig_OledType_ARRAYSIZE ((Config_DisplayConfig_OledType)(Config_DisplayConfig_OledType_OLED_SH1107+1))
 
 #define _Config_DisplayConfig_DisplayMode_MIN Config_DisplayConfig_DisplayMode_DEFAULT
 #define _Config_DisplayConfig_DisplayMode_MAX Config_DisplayConfig_DisplayMode_COLOR