diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options
index 56b684b..5aa61d0 100644
--- a/meshtastic/device_ui.options
+++ b/meshtastic/device_ui.options
@@ -6,3 +6,5 @@
 *NodeFilter.hops_away int_size:8
 *NodeFilter.channel int_size:8
 *NodeHighlight.node_name max_size:16
+*GeoPoint.zoom int_size:8
+*Map.style max_size:20
diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto
index b704e47..9ac40a3 100644
--- a/meshtastic/device_ui.proto
+++ b/meshtastic/device_ui.proto
@@ -66,6 +66,11 @@ message DeviceUIConfig {
    * 8 integers for screen calibration data
    */
   bytes calibration_data = 14;
+
+  /*
+   * Map related data
+   */
+  Map map_data = 15;
 }
 
 
@@ -135,6 +140,40 @@ message NodeHighlight {
    
 }
 
+message GeoPoint {
+  /*
+   * Zoom level
+   */
+  int32 zoom = 1;
+
+   /*
+    * Coordinate: latitude 
+    */
+  int32 latitude = 2;
+   
+   /*
+    * Coordinate: longitude
+    */
+  int32 longitude = 3;
+}
+
+message Map {
+  /*
+   * Home coordinates
+   */
+  GeoPoint home = 1;
+
+  /*
+   * Map tile style
+   */
+  string style = 2;
+  
+  /*
+   * Map scroll follows GPS
+   */
+  bool follow_gps = 3;
+}
+
 enum Theme {
   /*
    * Dark