diff --git a/base b/base
index f89af6f13..535bc4c8c 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit f89af6f13b077688ad6dabeaacf41f17c3d753f9
+Subproject commit 535bc4c8c2b5a93ef9610d4c42deaac3173df40d
diff --git a/plugins/autostandby.koplugin/_meta.lua b/plugins/autostandby.koplugin/_meta.lua
index 9d14f4e91..02efd43fb 100644
--- a/plugins/autostandby.koplugin/_meta.lua
+++ b/plugins/autostandby.koplugin/_meta.lua
@@ -3,5 +3,4 @@ return {
     name = "autostandby",
     fullname = _("Auto Standby"),
     description = _([[Put into standby on no input, wake up from standby on UI input]]),
-    sorting_hint = "device",
 }
diff --git a/plugins/autostandby.koplugin/main.lua b/plugins/autostandby.koplugin/main.lua
index a1c996cbb..2ecfbe3e7 100644
--- a/plugins/autostandby.koplugin/main.lua
+++ b/plugins/autostandby.koplugin/main.lua
@@ -46,6 +46,7 @@ end
 
 function AutoStandby:addToMainMenu(menu_items)
     menu_items.autostandby = {
+        sorting_hint = "device",
         text = _("Auto-standby settings"),
         sub_item_table = {
             {
diff --git a/plugins/autosuspend.koplugin/_meta.lua b/plugins/autosuspend.koplugin/_meta.lua
index bd3dd16bb..573b9fde8 100644
--- a/plugins/autosuspend.koplugin/_meta.lua
+++ b/plugins/autosuspend.koplugin/_meta.lua
@@ -3,5 +3,4 @@ return {
     name = "autosuspend",
     fullname = _("Auto suspend"),
     description = _([[Suspends the device after a period of inactivity.]]),
-    sorting_hint = "device",
 }
diff --git a/plugins/autosuspend.koplugin/main.lua b/plugins/autosuspend.koplugin/main.lua
index 9abfea016..675a90ffc 100644
--- a/plugins/autosuspend.koplugin/main.lua
+++ b/plugins/autosuspend.koplugin/main.lua
@@ -134,6 +134,7 @@ end
 
 function AutoSuspend:addToMainMenu(menu_items)
     menu_items.autosuspend = {
+        sorting_hint = "device",
         text = _("Autosuspend timeout"),
         callback = function()
             local InfoMessage = require("ui/widget/infomessage")
diff --git a/plugins/autoturn.koplugin/_meta.lua b/plugins/autoturn.koplugin/_meta.lua
index 43dafcc1e..a422b2402 100644
--- a/plugins/autoturn.koplugin/_meta.lua
+++ b/plugins/autoturn.koplugin/_meta.lua
@@ -6,5 +6,4 @@ return {
 Automatically turns the page after a set period of time.
 
 Hold to set the scrolling distance.]]),
-    sorting_hint = "navi",
 }
diff --git a/plugins/autoturn.koplugin/main.lua b/plugins/autoturn.koplugin/main.lua
index 94c289d51..8c434d30d 100644
--- a/plugins/autoturn.koplugin/main.lua
+++ b/plugins/autoturn.koplugin/main.lua
@@ -112,6 +112,7 @@ end
 
 function AutoTurn:addToMainMenu(menu_items)
     menu_items.autoturn = {
+        sorting_hint = "navi",
         text_func = function() return self:_enabled() and T(_("Autoturn (%1 s)"), self.autoturn_sec)
             or _("Autoturn") end,
         checked_func = function() return self:_enabled() end,