diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua
index f36dc4dc8..b7d5f2cfc 100644
--- a/frontend/apps/filemanager/filemanagermenu.lua
+++ b/frontend/apps/filemanager/filemanagermenu.lua
@@ -87,6 +87,7 @@ function FileManagerMenu:setUpdateItemTable()
         ReaderFrontLight:addToMainMenu(self.tab_item_table)
     end
 
+    table.insert(self.tab_item_table.setting, UIManager:getRefreshMenuTable())
     table.insert(self.tab_item_table.setting, {
         text = _("Night mode"),
         checked_func = function() return G_reader_settings:readSetting("night_mode") end,
diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua
index 391d02609..efbdd5c85 100644
--- a/frontend/apps/reader/modules/readerfooter.lua
+++ b/frontend/apps/reader/modules/readerfooter.lua
@@ -126,7 +126,7 @@ function ReaderFooter:updateFooterPage()
     self.progress_bar.percentage = self.pageno / self.pages
     if DMINIBAR_ALL_AT_ONCE then
         self.progress_text.text = ""
-        if DMINIBAR_NEXT_CHAPTER then
+        if DMINIBAR_BATTERY then
             local powerd = Device:getPowerDevice()
             local state = powerd:isCharging() and -1 or powerd:getCapacity()
             self.progress_text.text = self.progress_text.text .. " | B:" .. powerd:getCapacity() .. "%"
diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua
index ba0d3252e..0e5481ae1 100644
--- a/frontend/apps/reader/modules/readermenu.lua
+++ b/frontend/apps/reader/modules/readermenu.lua
@@ -80,6 +80,15 @@ function ReaderMenu:setUpdateItemTable()
     end
 
     -- setting tab
+    table.insert(self.tab_item_table.setting, {
+        text = _("Show advanced options"),
+        checked_func = function() return G_reader_settings:readSetting("show_advanced") end,
+        callback = function()
+            local show_advanced = G_reader_settings:readSetting("show_advanced") or false
+            G_reader_settings:saveSetting("show_advanced", not show_advanced)
+        end
+    })
+    table.insert(self.tab_item_table.setting, UIManager:getRefreshMenuTable())
     table.insert(self.tab_item_table.setting, {
         text = _("Night mode"),
         checked_func = function() return G_reader_settings:readSetting("night_mode") end,
@@ -90,15 +99,6 @@ function ReaderMenu:setUpdateItemTable()
         end
     })
     table.insert(self.tab_item_table.setting, Screen:getDPIMenuTable())
-    table.insert(self.tab_item_table.setting, self:genRefreshRateMenu())
-    table.insert(self.tab_item_table.setting, {
-        text = _("Show advanced options"),
-        checked_func = function() return G_reader_settings:readSetting("show_advanced") end,
-        callback = function()
-            local show_advanced = G_reader_settings:readSetting("show_advanced") or false
-            G_reader_settings:saveSetting("show_advanced", not show_advanced)
-        end
-    })
     table.insert(self.tab_item_table.setting, Language:getLangMenuTable())
 
     -- info tab
@@ -121,88 +121,6 @@ function ReaderMenu:setUpdateItemTable()
     })
 end
 
-function ReaderMenu:genRefreshRateMenu()
-    local custom_1 = function() return G_reader_settings:readSetting("refresh_rate_1") or 12 end
-    local custom_2 = function() return G_reader_settings:readSetting("refresh_rate_2") or 22 end
-    local custom_3 = function() return G_reader_settings:readSetting("refresh_rate_3") or 99 end
-    return {
-        text = _("E-ink full refresh rate"),
-        sub_item_table = {
-            {
-                text = _("Every page"),
-                checked_func = function() return UIManager:getRefreshRate() == 1 end,
-                callback = function() UIManager:setRefreshRate(1) end,
-            },
-            {
-                text = _("Every 6 pages"),
-                checked_func = function() return UIManager:getRefreshRate() == 6 end,
-                callback = function() UIManager:setRefreshRate(6) end,
-            },
-            {
-                text_func = function() return _("Custom ") .. "1: " .. custom_1() .. _(" pages") end,
-                checked_func = function() return UIManager:getRefreshRate() == custom_1() end,
-                callback = function() UIManager:setRefreshRate(custom_1()) end,
-                hold_callback = function() self:makeCustomRateDialog("refresh_rate_1") end,
-            },
-            {
-                text_func = function() return _("Custom ") .. "2: " .. custom_2() .. _(" pages") end,
-                checked_func = function() return UIManager:getRefreshRate() == custom_2() end,
-                callback = function() UIManager:setRefreshRate(custom_2()) end,
-                hold_callback = function() self:makeCustomRateDialog("refresh_rate_2") end,
-            },
-            {
-                text_func = function() return _("Custom ") .. "3: " .. custom_3() .. _(" pages") end,
-                checked_func = function() return UIManager:getRefreshRate() == custom_3() end,
-                callback = function() UIManager:setRefreshRate(custom_3()) end,
-                hold_callback = function() self:makeCustomRateDialog("refresh_rate_3") end,
-            },
-        }
-    }
-end
-
-function ReaderMenu:makeCustomRate(custom_rate)
-    local number = tonumber(self.custom_dialog:getInputText())
-    G_reader_settings:saveSetting(custom_rate, number)
-end
-
-function ReaderMenu:makeCustomRateDialog(custom_rate)
-    self.custom_dialog = InputDialog:new{
-        title = _("Input page number for a full refresh"),
-        input_hint = "(1 - 99)",
-        buttons = {
-            {
-                {
-                    text = _("Cancel"),
-                    callback = function()
-                        self:closeMakeCustomDialog()
-                    end,
-                },
-                {
-                    text = _("OK"),
-                    callback = function()
-                        self:makeCustomRate(custom_rate)
-                        self:closeMakeCustomDialog()
-                    end,
-                },
-            },
-        },
-        input_type = "number",
-        enter_callback = function()
-            self:makeCustomRate(custom_rate)
-            self:closeMakeCustomDialog()
-        end,
-        width = Screen:getWidth() * 0.8,
-        height = Screen:getHeight() * 0.2,
-    }
-    self.custom_dialog:onShowKeyboard()
-    UIManager:show(self.custom_dialog)
-end
-
-function ReaderMenu:closeMakeCustomDialog()
-    self.custom_dialog:onClose()
-    UIManager:close(self.custom_dialog)
-end
-
 function ReaderMenu:onShowReaderMenu()
     if #self.tab_item_table.setting == 0 then
         self:setUpdateItemTable()
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index a9686ed98..a1324615d 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -72,6 +72,7 @@ local KoptOptions = {
                 toggle = {S.SMALL, S.MEDIUM, S.LARGE},
                 values = {1.0, 1.2, 1.4},
                 default_value = DKOPTREADER_CONFIG_LINE_SPACING,
+                advanced = true,
             },
             {
                 name = "max_columns",
@@ -96,6 +97,7 @@ local KoptOptions = {
                 },
                 values = {-1,0,1,2,3},
                 default_value = DKOPTREADER_CONFIG_JUSTIFICATION,
+                advanced = true,
             },
         }
     },
@@ -193,6 +195,7 @@ local KoptOptions = {
                 toggle = {S.LTR, S.RTL, S.TBRTL},
                 values = {0, 1, 2},
                 default_value = 0,
+                advanced = true,
             },
             {
                 name = "quality",
@@ -200,6 +203,7 @@ local KoptOptions = {
                 toggle = {S.LOW, S.DEFAULT, S.HIGH},
                 values={0.5, 1.0, 1.5},
                 default_value = DKOPTREADER_CONFIG_RENDER_QUALITY,
+                advanced = true,
             },
             {
                 name = "forced_ocr",
diff --git a/frontend/ui/device/screen.lua b/frontend/ui/device/screen.lua
index b87ffd790..2e9d4036c 100644
--- a/frontend/ui/device/screen.lua
+++ b/frontend/ui/device/screen.lua
@@ -138,7 +138,9 @@ function Screen:getHeightPhoenix()
 end
 
 function Screen:getDPI()
-    self.dpi = G_reader_settings:readSetting("screen_dpi")
+    if self.dpi == nil then
+        self.dpi = G_reader_settings:readSetting("screen_dpi")
+    end
     if self.dpi ~= nil then return self.dpi end
     local model = self.device:getModel()
     if model == "KindlePaperWhite" or model == "KindlePaperWhite2"
@@ -162,7 +164,6 @@ end
 
 function Screen:setDPI(dpi)
     G_reader_settings:saveSetting("screen_dpi", dpi)
-    self.dpi = dpi
 end
 
 function Screen:scaleByDPI(px)
@@ -238,40 +239,69 @@ function Screen:restoreFromBB(bb)
 end
 
 function Screen:getDPIMenuTable()
+    local function dpi() return G_reader_settings:readSetting("screen_dpi") end
+    local function custom() return G_reader_settings:readSetting("custom_screen_dpi") end
+    local function setDPI(dpi)
+        local InfoMessage = require("ui/widget/infomessage")
+        local UIManager = require("ui/uimanager")
+        UIManager:show(InfoMessage:new{
+            text = _("This will take effect on next restart."),
+        })
+        Screen:setDPI(dpi)
+    end
     return {
-        text = _("Font size"),
+        text = _("Screen DPI"),
         sub_item_table = {
             {
                 text = _("Auto"),
                 checked_func = function()
-                    local dpi = G_reader_settings:readSetting("screen_dpi")
-                    return dpi == nil
+                    return dpi() == nil
                 end,
-                callback = function() Screen:setDPI() end
+                callback = function() setDPI() end
             },
             {
                 text = _("Small"),
                 checked_func = function()
-                    local dpi = G_reader_settings:readSetting("screen_dpi")
-                    return dpi and dpi <= 140
+                    local dpi, custom = dpi(), custom()
+                    return dpi and dpi <= 140 and dpi ~= custom
                 end,
-                callback = function() Screen:setDPI(120) end
+                callback = function() setDPI(120) end
             },
             {
                 text = _("Medium"),
                 checked_func = function()
-                    local dpi = G_reader_settings:readSetting("screen_dpi")
-                    return dpi and dpi > 140 and dpi <= 200
+                    local dpi, custom = dpi(), custom()
+                    return dpi and dpi > 140 and dpi <= 200 and dpi ~= custom
                 end,
-                callback = function() Screen:setDPI(160) end
+                callback = function() setDPI(160) end
             },
             {
                 text = _("Large"),
                 checked_func = function()
-                    local dpi = G_reader_settings:readSetting("screen_dpi")
-                    return dpi and dpi > 200
+                    local dpi, custom = dpi(), custom()
+                    return dpi and dpi > 200 and dpi ~= custom
+                end,
+                callback = function() setDPI(240) end
+            },
+            {
+                text = _("Custom DPI") .. ": " .. custom() or 160,
+                checked_func = function()
+                    local dpi, custom = dpi(), custom()
+                    return custom and dpi == custom
                 end,
-                callback = function() Screen:setDPI(240) end
+                callback = function() setDPI(custom() or 160) end,
+                hold_input = {
+                    title = _("Input screen DPI"),
+                    type = "number",
+                    hint = "(90 - 330)",
+                    callback = function(input)
+                        local dpi = tonumber(input)
+                        dpi = dpi < 90 and 90 or dpi
+                        dpi = dpi > 330 and 330 or dpi
+                        G_reader_settings:saveSetting("custom_screen_dpi", dpi)
+                        setDPI(dpi)
+                    end,
+                },
             },
         }
     }
diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
index a128906dc..f57b9d105 100644
--- a/frontend/ui/uimanager.lua
+++ b/frontend/ui/uimanager.lua
@@ -440,6 +440,57 @@ function UIManager:run()
     end
 end
 
+function UIManager:getRefreshMenuTable()
+    local function custom_1() return G_reader_settings:readSetting("refresh_rate_1") or 12 end
+    local function custom_2() return G_reader_settings:readSetting("refresh_rate_2") or 22 end
+    local function custom_3() return G_reader_settings:readSetting("refresh_rate_3") or 99 end
+    local function custom_input(name)
+        return {
+            title = _("Input page number for a full refresh"),
+            type = "number",
+            hint = "(1 - 99)",
+            callback = function(input)
+                local rate = tonumber(input)
+                G_reader_settings:saveSetting(name, rate)
+                UIManager:setRefreshRate(rate)
+            end,
+        }
+    end
+    return {
+        text = _("E-ink full refresh rate"),
+        sub_item_table = {
+            {
+                text = _("Every page"),
+                checked_func = function() return UIManager:getRefreshRate() == 1 end,
+                callback = function() UIManager:setRefreshRate(1) end,
+            },
+            {
+                text = _("Every 6 pages"),
+                checked_func = function() return UIManager:getRefreshRate() == 6 end,
+                callback = function() UIManager:setRefreshRate(6) end,
+            },
+            {
+                text_func = function() return _("Custom ") .. "1: " .. custom_1() .. _(" pages") end,
+                checked_func = function() return UIManager:getRefreshRate() == custom_1() end,
+                callback = function() UIManager:setRefreshRate(custom_1()) end,
+                hold_input = custom_input("refresh_rate_1")
+            },
+            {
+                text_func = function() return _("Custom ") .. "2: " .. custom_2() .. _(" pages") end,
+                checked_func = function() return UIManager:getRefreshRate() == custom_2() end,
+                callback = function() UIManager:setRefreshRate(custom_2()) end,
+                hold_input = custom_input("refresh_rate_2")
+            },
+            {
+                text_func = function() return _("Custom ") .. "3: " .. custom_3() .. _(" pages") end,
+                checked_func = function() return UIManager:getRefreshRate() == custom_3() end,
+                callback = function() UIManager:setRefreshRate(custom_3()) end,
+                hold_input = custom_input("refresh_rate_3")
+            },
+        }
+    }
+end
+
 UIManager:init()
 return UIManager
 
diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index 2a563bba5..815c8fca0 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -3,21 +3,21 @@ local FrameContainer = require("ui/widget/container/framecontainer")
 local LeftContainer = require("ui/widget/container/leftcontainer")
 local RightContainer = require("ui/widget/container/rightcontainer")
 local CenterContainer = require("ui/widget/container/centercontainer")
-local Font = require("ui/font")
-local TextWidget = require("ui/widget/textwidget")
-local LineWidget = require("ui/widget/linewidget")
-local Screen = require("ui/screen")
-local Device = require("ui/device")
-local GestureRange = require("ui/gesturerange")
 local HorizontalGroup = require("ui/widget/horizontalgroup")
 local VerticalGroup = require("ui/widget/verticalgroup")
 local HorizontalSpan = require("ui/widget/horizontalspan")
 local VerticalSpan = require("ui/widget/verticalspan")
+local InputDialog = require("ui/widget/inputdialog")
+local TextWidget = require("ui/widget/textwidget")
+local LineWidget = require("ui/widget/linewidget")
 local IconButton = require("ui/widget/iconbutton")
+local GestureRange = require("ui/gesturerange")
 local Button = require("ui/widget/button")
 local UIManager = require("ui/uimanager")
+local Device = require("ui/device")
 local Screen = require("ui/screen")
 local Geom = require("ui/geometry")
+local Font = require("ui/font")
 local DEBUG = require("dbg")
 local _ = require("gettext")
 
@@ -487,43 +487,91 @@ function TouchMenu:onSwipe(arg, ges_ev)
 end
 
 function TouchMenu:onMenuSelect(item)
-    local sub_item_table = item.sub_item_table
-    if item.sub_item_table_func then
-        sub_item_table = item.sub_item_table_func()
+    if item.tap_input then
+        self:closeMenu()
+        self:onMenuInput(item.tap_input)
+    else
+        local sub_item_table = item.sub_item_table
+        if item.sub_item_table_func then
+            sub_item_table = item.sub_item_table_func()
+        end
+        if sub_item_table == nil then
+            local callback = item.callback
+            if item.callback_func then
+                callback = item.callback_func()
+            end
+            if callback then
+                -- put stuff in scheduler so we can See
+                -- the effect of inverted menu item
+                UIManager:scheduleIn(0.1, function()
+                    self:closeMenu()
+                    callback()
+                end)
+            end
+        else
+            table.insert(self.item_table_stack, self.item_table)
+            self.item_table = sub_item_table
+            self:updateItems()
+        end
     end
-    if sub_item_table == nil then
-        local callback = item.callback
-        if item.callback_func then
-            callback = item.callback_func()
+    return true
+end
+
+function TouchMenu:onMenuHold(item)
+    if item.hold_input then
+        self:closeMenu()
+        self:onMenuInput(item.hold_input)
+    else
+        local callback = item.hold_callback
+        if item.hold_callback_func then
+            callback = item.hold_callback_func()
         end
         if callback then
-            -- put stuff in scheduler so we can See
-            -- the effect of inverted menu item
             UIManager:scheduleIn(0.1, function()
                 self:closeMenu()
                 callback()
             end)
         end
-    else
-        table.insert(self.item_table_stack, self.item_table)
-        self.item_table = sub_item_table
-        self:updateItems()
     end
     return true
 end
 
-function TouchMenu:onMenuHold(item)
-    local callback = item.hold_callback
-    if item.hold_callback_func then
-        callback = item.hold_callback_func()
-    end
-    if callback then
-        UIManager:scheduleIn(0.1, function()
-            self:closeMenu()
-            callback()
-        end)
-    end
-    return true
+function TouchMenu:onMenuInput(input)
+    self.input_dialog = InputDialog:new{
+        title = input.title or "",
+        input_hint = input.hint or "",
+        input_type = input.type or "number",
+        buttons = {
+            {
+                {
+                    text = _("Cancel"),
+                    callback = function()
+                        self:closeInputDialog()
+                    end,
+                },
+                {
+                    text = _("OK"),
+                    callback = function()
+                        input.callback(self.input_dialog:getInputText())
+                        self:closeInputDialog()
+                    end,
+                },
+            },
+        },
+        enter_callback = function()
+            input.callback(self.input_dialog:getInputText())
+            self:closeInputDialog()
+        end,
+        width = Screen:getWidth() * 0.8,
+        height = Screen:getHeight() * 0.2,
+    }
+    self.input_dialog:onShowKeyboard()
+    UIManager:show(self.input_dialog)
+end
+
+function TouchMenu:closeInputDialog()
+    self.input_dialog:onClose()
+    UIManager:close(self.input_dialog)
 end
 
 function TouchMenu:onTapCloseAllMenus(arg, ges_ev)
diff --git a/l10n/templates/koreader.pot b/l10n/templates/koreader.pot
index faee2cf6d..ccefb888b 100644
--- a/l10n/templates/koreader.pot
+++ b/l10n/templates/koreader.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2014-08-01 04:35+0000\n"
+"POT-Creation-Date: 2014-08-05 04:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,9 +17,9 @@ msgid ""
 " others."
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:197
-#: frontend/apps/reader/modules/readermenu.lua:203
-#: frontend/apps/reader/modules/readermenu.lua:209
+#: frontend/ui/uimanager.lua:473
+#: frontend/ui/uimanager.lua:479
+#: frontend/ui/uimanager.lua:485
 msgid ""
 " pages"
 msgstr ""
@@ -65,9 +65,8 @@ msgid ""
 "Apply"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:105
-#: frontend/apps/reader/modules/readermenu.lua:96
 #: frontend/apps/reader/modules/readertypeset.lua:66
+#: frontend/ui/device/screen.lua:256
 msgid ""
 "Auto"
 msgstr ""
@@ -83,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: frontend/apps/reader/modules/readergoto.lua:36
-#: frontend/apps/reader/modules/readermenu.lua:230
 #: frontend/ui/widget/confirmbox.lua:29
+#: frontend/ui/widget/touchmenu.lua:547
 #: plugins/evernote.koplugin/main.lua:124
 #: plugins/zsync.koplugin/main.lua:279
 msgid ""
@@ -101,8 +100,7 @@ msgid ""
 "Change font"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:142
-#: frontend/apps/reader/modules/readermenu.lua:142
+#: frontend/ui/otamanager.lua:94
 msgid ""
 "Check update"
 msgstr ""
@@ -133,13 +131,18 @@ msgid ""
 "Copy"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:197
-#: frontend/apps/reader/modules/readermenu.lua:203
-#: frontend/apps/reader/modules/readermenu.lua:209
+#: frontend/ui/uimanager.lua:473
+#: frontend/ui/uimanager.lua:479
+#: frontend/ui/uimanager.lua:485
 msgid ""
 "Custom "
 msgstr ""
 
+#: frontend/ui/device/screen.lua:287
+msgid ""
+"Custom DPI"
+msgstr ""
+
 #: frontend/apps/filemanager/filemanager.lua:104
 msgid ""
 "Cut"
@@ -182,8 +185,7 @@ msgid ""
 "Do you want to Turn on Wifi?"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:155
-#: frontend/apps/reader/modules/readermenu.lua:155
+#: frontend/ui/otamanager.lua:107
 msgid ""
 "Do you want to update to version "
 msgstr ""
@@ -193,12 +195,17 @@ msgid ""
 "Document Language"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:287
+#: frontend/apps/reader/modules/readermenu.lua:150
 msgid ""
 "Document menu"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:184
+#: frontend/ui/otamanager.lua:110
+msgid ""
+"Downloading may take several minutes..."
+msgstr ""
+
+#: frontend/ui/uimanager.lua:460
 msgid ""
 "E-ink full refresh rate"
 msgstr ""
@@ -235,12 +242,12 @@ msgid ""
 "Evernote"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:192
+#: frontend/ui/uimanager.lua:468
 msgid ""
 "Every 6 pages"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:187
+#: frontend/ui/uimanager.lua:463
 msgid ""
 "Every page"
 msgstr ""
@@ -261,12 +268,22 @@ msgid ""
 "Exported notes in book:"
 msgstr ""
 
+#: plugins/evernote.koplugin/main.lua:108
+msgid ""
+"Exporting may take several minutes..."
+msgstr ""
+
+#: plugins/evernote.koplugin/main.lua:92
+msgid ""
+"Exporting may take several seconds..."
+msgstr ""
+
 #: reader.lua:80
 msgid ""
 "File does not exist"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:202
+#: frontend/apps/filemanager/filemanagermenu.lua:147
 msgid ""
 "File manager menu"
 msgstr ""
@@ -291,12 +308,6 @@ msgid ""
 "Font Weight"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:102
-#: frontend/apps/reader/modules/readermenu.lua:93
-msgid ""
-"Font size"
-msgstr ""
-
 #: frontend/ui/data/strings.lua:30
 msgid ""
 "Forced OCR"
@@ -337,8 +348,8 @@ msgid ""
 "Go to Page or Location"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:170
-#: frontend/apps/reader/modules/readermenu.lua:170
+#: frontend/apps/filemanager/filemanagermenu.lua:115
+#: frontend/apps/reader/modules/readermenu.lua:115
 msgid ""
 "Help"
 msgstr ""
@@ -374,11 +385,16 @@ msgid ""
 "Indentation"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:225
+#: frontend/ui/uimanager.lua:449
 msgid ""
 "Input page number for a full refresh"
 msgstr ""
 
+#: frontend/ui/device/screen.lua:294
+msgid ""
+"Input screen DPI"
+msgstr ""
+
 #: frontend/apps/reader/modules/readerhighlight.lua:93
 msgid ""
 "Invert"
@@ -389,6 +405,11 @@ msgid ""
 "Koreader Notes"
 msgstr ""
 
+#: frontend/ui/otamanager.lua:116
+msgid ""
+"Koreader will be updated on next restart."
+msgstr ""
+
 #: frontend/ui/data/strings.lua:58
 msgid ""
 "LTR"
@@ -399,8 +420,7 @@ msgid ""
 "Language"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:129
-#: frontend/apps/reader/modules/readermenu.lua:120
+#: frontend/ui/device/screen.lua:279
 msgid ""
 "Large"
 msgstr ""
@@ -446,8 +466,7 @@ msgid ""
 "Logout"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:121
-#: frontend/apps/reader/modules/readermenu.lua:112
+#: frontend/ui/device/screen.lua:271
 msgid ""
 "Medium"
 msgstr ""
@@ -457,8 +476,8 @@ msgid ""
 "More"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:91
-#: frontend/apps/reader/modules/readermenu.lua:84
+#: frontend/apps/filemanager/filemanagermenu.lua:92
+#: frontend/apps/reader/modules/readermenu.lua:93
 msgid ""
 "Night mode"
 msgstr ""
@@ -479,14 +498,13 @@ msgid ""
 msgstr ""
 
 #: frontend/apps/reader/modules/readerfrontlight.lua:115
-#: frontend/apps/reader/modules/readermenu.lua:236
 #: frontend/ui/widget/confirmbox.lua:28
+#: frontend/ui/widget/touchmenu.lua:553
 msgid ""
 "OK"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:151
-#: frontend/apps/reader/modules/readermenu.lua:151
+#: frontend/ui/otamanager.lua:103
 msgid ""
 "OTA server is not available."
 msgstr ""
@@ -531,8 +549,8 @@ msgid ""
 "Paste"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:173
-#: frontend/apps/reader/modules/readermenu.lua:173
+#: frontend/apps/filemanager/filemanagermenu.lua:118
+#: frontend/apps/reader/modules/readermenu.lua:118
 msgid ""
 "Please report bugs to \n"
 "https://github.com/koreader/koreader/issues"
@@ -583,6 +601,11 @@ msgid ""
 "Sandbox"
 msgstr ""
 
+#: frontend/ui/device/screen.lua:253
+msgid ""
+"Screen DPI"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:5
 msgid ""
 "Screen Mode"
@@ -633,7 +656,7 @@ msgid ""
 "Share"
 msgstr ""
 
-#: frontend/apps/reader/modules/readermenu.lua:131
+#: frontend/apps/reader/modules/readermenu.lua:84
 msgid ""
 "Show advanced options"
 msgstr ""
@@ -648,8 +671,7 @@ msgid ""
 "Show page overlap"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:113
-#: frontend/apps/reader/modules/readermenu.lua:104
+#: frontend/ui/device/screen.lua:263
 msgid ""
 "Small"
 msgstr ""
@@ -709,14 +731,9 @@ msgid ""
 "Text Align"
 msgstr ""
 
-#: plugins/evernote.koplugin/main.lua:108
+#: frontend/ui/device/screen.lua:248
 msgid ""
-"This may take several minutes..."
-msgstr ""
-
-#: plugins/evernote.koplugin/main.lua:92
-msgid ""
-"This may take several seconds..."
+"This will take effect on next restart."
 msgstr ""
 
 #: frontend/apps/reader/modules/readerfrontlight.lua:100
@@ -734,8 +751,8 @@ msgid ""
 "Underscore"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:162
-#: frontend/apps/reader/modules/readermenu.lua:162
+#: frontend/apps/filemanager/filemanagermenu.lua:107
+#: frontend/apps/reader/modules/readermenu.lua:107
 msgid ""
 "Version"
 msgstr ""
@@ -770,8 +787,7 @@ msgid ""
 "Yinxiang"
 msgstr ""
 
-#: frontend/apps/filemanager/filemanagermenu.lua:147
-#: frontend/apps/reader/modules/readermenu.lua:147
+#: frontend/ui/otamanager.lua:99
 msgid ""
 "Your koreader is updated."
 msgstr ""
@@ -907,7 +923,7 @@ msgid ""
 "mini"
 msgstr ""
 
-#: frontend/ui/widget/menu.lua:543
+#: frontend/ui/widget/menu.lua:565
 msgid ""
 "no choices available"
 msgstr ""
@@ -932,7 +948,7 @@ msgid ""
 "page"
 msgstr ""
 
-#: frontend/ui/widget/menu.lua:537
+#: frontend/ui/widget/menu.lua:554
 msgid ""
 "page "
 msgstr ""