diff --git a/HISTORY.md b/HISTORY.md
index 7f25b41..b43d876 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -40,3 +40,4 @@
 |   2.25  | 2 Bug fixes. First time startup issues caused by v2.24 change and a fix for pure numbers in returned templates. |
 |   2.26  | Retry responsive menu fix failed in v2.24. Cosmetic internal class changes. |
 |   2.27  | Trivial bug fix for the glance view to prevent the "Unconfigured" result being erroneously displayed because the settings were not yet pulled from persistent storage. |
+|   2.28  | Added support for Vivoactive 6 device which also required an SDK update to 8.1.0. |
diff --git a/manifest.xml b/manifest.xml
index 6db0131..8dc2d79 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -28,7 +28,7 @@
     Testing in VSCode requires monkey.jungle, so for convenience, swap between
     watch-app and widget by changing which of the next two lines are commented out
   -->
-  <iq:application id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
+  <iq:application id="40131e87-31ff-454b-a8e2-92276ee399d6" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
     <!--
       Use the following from the Visual Studio Code command palette to edit
       the build targets:
@@ -159,6 +159,7 @@
       <iq:product id="vivoactive4"/>
       <iq:product id="vivoactive4s"/>
       <iq:product id="vivoactive5"/>
+      <iq:product id="vivoactive6"/>
     </iq:products>
     <!--
       Use "Monkey C: Edit Permissions" from the Visual Studio Code command
diff --git a/monkey.jungle b/monkey.jungle
index d10f4ed..69fb9ba 100644
--- a/monkey.jungle
+++ b/monkey.jungle
@@ -241,5 +241,7 @@ vivoactive3mlte.resourcePath = $(vivoactive3mlte.resourcePath);resources-launche
 vivoactive4.resourcePath = $(vivoactive4.resourcePath);resources-launcher-35-35;resources-icons-30
 # Screen Size 218x218 launcher icon size 30x30
 vivoactive4s.resourcePath = $(vivoactive4s.resourcePath);resources-launcher-30-30;resources-icons-26
-# Screen Size 390x390 launcher icon size 70x70
-vivoactive5.resourcePath = $(vivoactive5.resourcePath);resources-launcher-70-70;resources-icons-46
+# Screen Size 390x390 launcher icon size 56x56
+vivoactive5.resourcePath = $(vivoactive5.resourcePath);resources-launcher-56-56;resources-icons-46
+# Screen Size 390x390 launcher icon size 54x54
+vivoactive6.resourcePath = $(vivoactive6.resourcePath);resources-launcher-54-54;resources-icons-46
diff --git a/source/HomeAssistantMenuItem.mc b/source/HomeAssistantMenuItem.mc
index fbb060d..7a185e5 100644
--- a/source/HomeAssistantMenuItem.mc
+++ b/source/HomeAssistantMenuItem.mc
@@ -51,7 +51,7 @@ class HomeAssistantMenuItem extends WatchUi.IconMenuItem {
         return mTemplate;
     }
 
-    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
+    function updateState(data as Lang.String or Lang.Dictionary or Lang.Number or Lang.Float or Null) as Void {
         if (data == null) {
             setSubLabel($.Rez.Strings.Empty);
         } else if(data instanceof Lang.String) {
diff --git a/source/HomeAssistantToggleMenuItem.mc b/source/HomeAssistantToggleMenuItem.mc
index d7a14d0..cff6c90 100644
--- a/source/HomeAssistantToggleMenuItem.mc
+++ b/source/HomeAssistantToggleMenuItem.mc
@@ -75,7 +75,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
         return "{{states('" + mData.get("entity_id") + "')}}";
     }
 
-    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
+    function updateState(data as Lang.String or Lang.Dictionary or Lang.Number or Lang.Float or Null) as Void {
         if (data == null) {
             setSubLabel(null);
         } else if(data instanceof Lang.String) {