diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index c50adb941..e3d1dbadb 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -43,7 +43,7 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
         # - board: pico
-          
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -133,11 +133,11 @@ jobs:
       - name: Upgrade platformio
         run: |
           pio upgrade
-          
+
       - name: Pull web ui
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          repo: "meshtastic/meshtastic-web"
+          repo: "meshtastic/web"
           file: "build.tar"
           target: "build.tar"
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -149,7 +149,7 @@ jobs:
 
       - name: Build ESP32
         run: bin/build-esp32.sh ${{ matrix.board }}
-         
+
       - name: Pull OTA Firmware
         uses: dsaltares/fetch-gh-release-asset@master
         with:
@@ -157,7 +157,7 @@ jobs:
           file: "firmware.bin"
           target: "release/bleota.bin"
           token: ${{ secrets.GITHUB_TOKEN }}
-          
+
       - name: Get release version string
         run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
         id: version
@@ -394,7 +394,7 @@ jobs:
       # For diagnostics
       - name: Show artifacts
         run: ls -lR
-        
+
       - name: Device scripts permissions
         run: |
           chmod +x ./output/device-install.sh
@@ -429,7 +429,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-          
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -443,7 +443,7 @@ jobs:
         with:
           name: firmware-${{ steps.version.outputs.version }}
           path: ./output
-      
+
       - name: Device scripts permissions
         run: |
           chmod +x ./output/device-install.sh
@@ -456,7 +456,7 @@ jobs:
         with:
           name: debug-elfs-${{ steps.version.outputs.version }}.zip
           path: ./elfs
-      
+
       - name: Zip Elfs
         run: zip -j -r ./debug-elfs-${{ steps.version.outputs.version }}.zip ./elfs
 
@@ -500,10 +500,9 @@ jobs:
       - name: Bump version.properties
         run: >-
           bin/bump_version.py
-          
+
       - name: Create version.properties pull request
         uses: peter-evans/create-pull-request@v3
         with:
           add-paths: |
             version.properties
-
diff --git a/.gitmodules b/.gitmodules
index 489f01bea..e6f376a0b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "protobufs"]
 	path = protobufs
-	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+	url = https://github.com/meshtastic/protobufs.git
diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
index ddc67e16d..82ac8feef 100644
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -58,8 +58,6 @@ char contentTypes[][2][32] = {{".txt", "text/plain"},     {".html", "text/html"}
                               {".css", "text/css"},       {".ico", "image/vnd.microsoft.icon"},
                               {".svg", "image/svg+xml"},  {"", ""}};
 
-// const char *tarURL = "https://www.casler.org/temp/meshtastic-web.tar";
-// const char *tarURL = "https://api-production-871d.up.railway.app/mirror/webui";
 // const char *certificate = NULL; // change this as needed, leave as is for no TLS check (yolo security)
 
 // Our API to handle messages to and from the radio.
@@ -75,8 +73,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio);
     ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);
 
-//    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
-//    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
 
     ResourceNode *nodeAdmin = new ResourceNode("/admin", "GET", &handleAdmin);
     //    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
@@ -160,7 +158,7 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Content-Type", "application/x-protobuf");
     res->setHeader("Access-Control-Allow-Origin", "*");
     res->setHeader("Access-Control-Allow-Methods", "GET");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");
 
     uint8_t txBuf[MAX_STREAM_BUF_SIZE];
     uint32_t len = 1;
@@ -204,7 +202,7 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Access-Control-Allow-Headers", "Content-Type");
     res->setHeader("Access-Control-Allow-Origin", "*");
     res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");
 
     if (req->getMethod() == "OPTIONS") {
         res->setStatusCode(204); // Success with no content
@@ -266,7 +264,7 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
             if (levels) {
 #ifdef ARCH_ESP32
                 htmlListDir(fileList, file.path(), levels - 1);
-#else                
+#else
                 htmlListDir(fileList, file.name(), levels - 1);
 #endif
                 file.close();
@@ -274,7 +272,7 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
         } else {
             std::map<char *, char *> thisFileMap;
             thisFileMap[strdup("size")] = strdup(String(file.size()).c_str());
-#ifdef ARCH_ESP32            
+#ifdef ARCH_ESP32
             thisFileMap[strdup("name")] = strdup(String(file.path()).substring(1).c_str());
 #else
             thisFileMap[strdup("name")] = strdup(String(file.name()).substring(1).c_str());