diff --git a/meshtastic/config.proto b/meshtastic/config.proto
index 631a6fb..321bbb2 100644
--- a/meshtastic/config.proto
+++ b/meshtastic/config.proto
@@ -698,7 +698,7 @@ message Config {
      * If this is set, the displayed compass will always point north. if unset, the old behaviour
      * (top of display is heading direction) is used.
      */
-    bool compass_north_top = 4;
+    bool compass_north_top = 4 [deprecated = true];
 
     /*
      * Flip screen vertically, for cases that mount the screen upside down
@@ -919,27 +919,27 @@ message Config {
        * Philippines 915mhz
        */
       PH_915 = 21;
-      
+
       /*
        * Australia / New Zealand 433MHz
        */
       ANZ_433 = 22;
-      
+
       /*
        * Kazakhstan 433MHz
        */
       KZ_433 = 23;
-      
+
       /*
        * Kazakhstan 863MHz
        */
       KZ_863 = 24;
-      
+
       /*
        * Nepal 865MHz
        */
       NP_865 = 25;
-      
+
       /*
        * Brazil 902MHz
        */
diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 49dd597..37c9341 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -31,6 +31,9 @@
 *MyNodeInfo.air_period_tx       max_count:8
 *MyNodeInfo.air_period_rx       max_count:8
 
+*MyNodeInfo.firmware_edition int_size:8
+*MyNodeInfo.nodedb_count int_size:16
+
 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
 # here because we might need to fill with zeros for padding to encryption block size (16 bytes per block)
 *MeshPacket.encrypted max_size:256
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index d826269..e68c56b 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -774,6 +774,12 @@ enum HardwareModel {
    */
   THINKNODE_M5 = 107;
 
+  /*
+   * MeshSolar is an integrated power management and communication solution designed for outdoor low-power devices.
+   * https://heltec.org/project/meshsolar/
+   */
+  HELTEC_MESH_SOLAR = 108;
+
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------
    * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
@@ -1627,6 +1633,47 @@ enum CriticalErrorCode {
   FLASH_CORRUPTION_UNRECOVERABLE = 13;
 }
 
+/*
+ * Enum to indicate to clients whether this firmware is a special firmware build, like an event.
+ * The first 16 values are reserved for non-event special firmwares, like the Smart Citizen use case.
+ */
+enum FirmwareEdition {
+  /*
+   * Vanilla firmware
+   */
+  VANILLA = 0;
+
+  /*
+   * Firmware for use in the Smart Citizen environmental monitoring network
+   */
+  SMART_CITIZEN = 1;
+
+  /*
+   * Open Sauce, the maker conference held yearly in CA
+   */
+  OPEN_SAUCE = 16;
+
+  /*
+   * DEFCON, the yearly hacker conference
+   */
+  DEFCON = 17;
+
+  /*
+   * Burning Man, the yearly hippie gathering in the desert
+   */
+  BURNING_MAN = 18;
+
+  /*
+   * Hamvention, the Dayton amateur radio convention
+   */
+  HAMVENTION = 19;
+
+  /*
+   * Placeholder for DIY and unofficial events
+   */
+  DIY_EDITION = 127;
+}
+
 /*
  * Unique local debugging info for this node
  * Note: we don't include position or the user info, because that will come in the
@@ -1660,6 +1707,17 @@ message MyNodeInfo {
    * The PlatformIO environment used to build this firmware
    */
   string pio_env = 13;
+
+  /*
+   * The indicator for whether this device is running event firmware and which
+   */
+  FirmwareEdition firmware_edition = 14;
+
+  /*
+   * The number of nodes in the nodedb.
+   * This is used by the phone to know how many NodeInfo packets to expect on want_config
+   */
+  uint32 nodedb_count = 15;
 }
 
 /*
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index 683ce9e..b878083 100644
--- a/meshtastic/module_config.proto
+++ b/meshtastic/module_config.proto
@@ -337,6 +337,9 @@ message ModuleConfig {
       // VE.Direct is a serial protocol used by Victron Energy products
       // https://beta.ivc.no/wiki/index.php/Victron_VE_Direct_DIY_Cable
       VE_DIRECT = 7;
+      //Used to configure and view some parameters of MeshSolar.
+      //https://heltec.org/project/meshsolar/
+      MS_CONFIG = 8;
     }
 
     /*
@@ -700,13 +703,13 @@ message ModuleConfig {
     /*
      * Enable/disable CannedMessageModule.
      */
-    bool enabled = 9;
+    bool enabled = 9 [deprecated = true];
 
     /*
      * Input event origin accepted by the canned message module.
      * Can be e.g. "rotEnc1", "upDownEnc1", "scanAndSelect", "cardkb", "serialkb", or keyword "_any"
      */
-    string allow_input_source = 10;
+    string allow_input_source = 10 [deprecated = true];
 
     /*
      * CannedMessageModule also sends a bell character with the messages.
diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto
index fb92189..036ffde 100644
--- a/meshtastic/telemetry.proto
+++ b/meshtastic/telemetry.proto
@@ -333,7 +333,7 @@ message AirQualityMetrics {
    * Formaldehyde sensor temperature in degrees Celsius
    */
   optional float form_temperature = 18;
-  
+
   /*
    * Concentration Units Standard PM4.0 in ug/m3
    */