diff --git a/Modules/Battery/popup.swift b/Modules/Battery/popup.swift
index bf8b4ffa..a6774358 100644
--- a/Modules/Battery/popup.swift
+++ b/Modules/Battery/popup.swift
@@ -79,7 +79,7 @@ internal class Popup: NSView {
         
         let view: NSView = NSView(frame: NSRect(x: 0, y: separator.frame.origin.y - self.detailsHeight, width: self.frame.width, height: self.detailsHeight))
         
-        self.levelField = PopupRow(view, n: 3, title: "\(LocalizedString("Details"))Level:", value: "")
+        self.levelField = PopupRow(view, n: 3, title: "\(LocalizedString("Level")):", value: "")
         self.sourceField = PopupRow(view, n: 2, title: "\(LocalizedString("Source")):", value: "")
         let t = self.labelValue(view, n: 1, title: "\(LocalizedString("Time")):", value: "")
         self.timeLabelField = t.0
diff --git a/README.md b/README.md
index fc162df3..a833491c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 <a href="https://github.com/exelban/stats/releases"><p align="center"><img src="https://serhiy.s3.eu-central-1.amazonaws.com/Github_repo/stats/logo.png?raw=true" width="120"></p></a>
 
-[![Stats](https://serhiy.s3.eu-central-1.amazonaws.com/Github_repo/stats/cover%3Fv1.6.0.png)](https://github.com/exelban/stats/releases)
+[![Stats](https://serhiy.s3.eu-central-1.amazonaws.com/Github_repo/stats/menus%3Fv2.3.2.png)](https://github.com/exelban/stats/releases)
+[![Stats](https://serhiy.s3.eu-central-1.amazonaws.com/Github_repo/stats/popups%3Fv2.3.2.png)](https://github.com/exelban/stats/releases)
 
 macOS system monitor in your menu bar
 
diff --git a/Stats/Supporting Files/cover.psd b/Stats/Supporting Files/cover.psd
deleted file mode 100644
index 92857bf6..00000000
Binary files a/Stats/Supporting Files/cover.psd and /dev/null differ
diff --git a/Stats/Supporting Files/en.lproj/Localizable.strings b/Stats/Supporting Files/en.lproj/Localizable.strings
index 2d965a0d..c0dd56c5 100644
--- a/Stats/Supporting Files/en.lproj/Localizable.strings	
+++ b/Stats/Supporting Files/en.lproj/Localizable.strings	
@@ -28,14 +28,14 @@
 "New version available" = "New version available";
 "Click to install the new version of Stats" = "Click to install the new version of Stats";
 "Successfully updated" = "Successfully updated";
-"Stats was updated to v" = "Stats was updated to v%@";
+"Stats was updated to v" = "Stats was updated to v%0";
 
 // Settings
 "Open Activity Monitor" = "Open Activity Monitor";
 "Report a bug" = "Report a bug";
 "Close application" = "Close application";
 "Open application settings" = "Open application settings";
-"Open moduleName settings" = "Open %@ settings";
+"Open moduleName settings" = "Open %0 settings";
 
 // Application settings
 "Update application" = "Update application";
@@ -62,7 +62,7 @@
 
 // Module Kit
 "Open module settings" = "Open module settings";
-"Select widget" = "Select %@ widget";
+"Select widget" = "Select %0 widget";
 "Update interval" = "Update interval";
 "Usage history" = "Usage history";
 "Details" = "Details";
@@ -95,7 +95,7 @@
 
 // Disk
 "Show removable disks" = "Show removable disks";
-"Used disk memory" = "Used %@ from %@";
+"Used disk memory" = "Used %0 from %1";
 "Disk to show" = "Disk to show";
 
 // Network
@@ -114,6 +114,7 @@
 "Network interface" = "Network interface";
 
 // Battery
+"Level" = "Level";
 "Source" = "Source";
 "Time" = "Time";
 "Health" = "Health";
@@ -131,4 +132,4 @@
 "Not connected" = "Not connected";
 "Low level notification" = "Low level notification";
 "Low battery" = "Low battery";
-"Battery remaining" = "%@% remaining";
+"Battery remaining" = "%0% remaining";
diff --git a/Stats/Supporting Files/menus.psd b/Stats/Supporting Files/menus.psd
new file mode 100644
index 00000000..f20d3169
Binary files /dev/null and b/Stats/Supporting Files/menus.psd differ
diff --git a/Stats/Supporting Files/pl.lproj/Localizable.strings b/Stats/Supporting Files/pl.lproj/Localizable.strings
index 13e9abd9..e708da21 100644
--- a/Stats/Supporting Files/pl.lproj/Localizable.strings	
+++ b/Stats/Supporting Files/pl.lproj/Localizable.strings	
@@ -28,14 +28,14 @@
 "New version available" = "Nowa wersja dostępna";
 "Click to install the new version of Stats" = "Kliknij aby zainstalować nową wersję";
 "Successfully updated" = "Zaktualizowano pomyślnie";
-"Stats was updated to v" = "Stats został zaktualizowany do v%@";
+"Stats was updated to v" = "Stats został zaktualizowany do v%0";
 
 // Settings
 "Open Activity Monitor" = "Otwórz Activity Monitor";
 "Report a bug" = "Zgłoś problem";
 "Close application" = "Zamknij program";
 "Open application settings" = "Otwórz ustawienie";
-"Open moduleName settings" = "Otwórz ustawienie %@";
+"Open moduleName settings" = "Otwórz ustawienie %0";
 
 // Application settings
 "Update application" = "Aktualizuj aplikacje";
@@ -62,7 +62,7 @@
 
 // Module Kit
 "Open module settings" = "Otwórz ustawienie modulu";
-"Select widget" = "Wybierz %@ widget";
+"Select widget" = "Wybierz %0 widget";
 "Update interval" = "Interwał odświeżania";
 "Usage history" = "Historia zużycia";
 "Details" = "Szczegóły";
@@ -95,7 +95,7 @@
 
 // Disk
 "Show removable disks" = "Pokaż dyski wymienne";
-"Used disk memory" = "Wykorzystano %@ z %@";
+"Used disk memory" = "Wykorzystano %0 z %1";
 "Disk to show" = "Aktywny dysk";
 
 // Network
@@ -114,6 +114,7 @@
 "Network interface" = "Interfejs sieciowy";
 
 // Battery
+"Level" = "Poziom naładowania";
 "Source" = "Źródło";
 "Time" = "Czas";
 "Health" = "Zdrowie";
@@ -131,4 +132,4 @@
 "Not connected" = "Nie podłączona";
 "Low level notification" = "Powiadomienie o niskim poziomie";
 "Low battery" = "Niski poziom baterii";
-"Battery remaining" = "Pozostało %@%";
+"Battery remaining" = "Pozostało %0%";
diff --git a/Stats/Supporting Files/popups.psd b/Stats/Supporting Files/popups.psd
new file mode 100644
index 00000000..7bcb4141
Binary files /dev/null and b/Stats/Supporting Files/popups.psd differ
diff --git a/Stats/Supporting Files/ru.lproj/Localizable.strings b/Stats/Supporting Files/ru.lproj/Localizable.strings
index 319e63ed..f68cfda6 100644
--- a/Stats/Supporting Files/ru.lproj/Localizable.strings	
+++ b/Stats/Supporting Files/ru.lproj/Localizable.strings	
@@ -28,14 +28,14 @@
 "New version available" = "Доступна новая версия";
 "Click to install the new version of Stats" = "Нажмите, чтобы установить новую версию Stats";
 "Successfully updated" = "Успешно обновлено";
-"Stats was updated to v" = "Stats обновлено до v%@";
+"Stats was updated to v" = "Stats обновлено до v%0";
 
 // Settings
 "Open Activity Monitor" = "Открыть Мониторинг системы";
 "Report a bug" = "Сообщить об ошибке";
 "Close application" = "Закрыть приложение";
 "Open application settings" = "Открыть настройки приложения";
-"Open moduleName settings" = "Откройте настройки %@";
+"Open moduleName settings" = "Откройте настройки %0";
 
 // Application settings
 "Update application" = "Обновить приложение";
@@ -62,7 +62,7 @@
 
 // Module Kit
 "Open module settings" = "Открыть настройки модуля";
-"Select widget" = "Активировать %@ виджет";
+"Select widget" = "Активировать %0 виджет";
 "Update interval" = "Интервал обновления";
 "Usage history" = "История использования";
 "Details" = "Подробности";
@@ -95,7 +95,7 @@
 
 // DiskF
 "Show removable disks" = "Показать съемные диски";
-"Used disk memory" = "Использовано %@ с %@";
+"Used disk memory" = "Использовано %0 с %1";
 "Disk to show" = "Активный диск";
 
 // Network
@@ -114,6 +114,7 @@
 "Network interface" = "Сетевой интерфейс";
 
 // Battery
+"Level" = "Уровень заряда";
 "Source" = "Источник";
 "Time" = "Время";
 "Health" = "Состояние аккумулятора";
@@ -131,4 +132,4 @@
 "Not connected" = "Не подключено";
 "Low level notification" = "Сообщение о низком уровне заряда";
 "Low battery" = "Низкий заряд аккумулятора";
-"Battery remaining" = "%@% осталось";
+"Battery remaining" = "%0% осталось";
diff --git a/Stats/Supporting Files/uk.lproj/Localizable.strings b/Stats/Supporting Files/uk.lproj/Localizable.strings
index b64017a9..e6c3d7b5 100644
--- a/Stats/Supporting Files/uk.lproj/Localizable.strings	
+++ b/Stats/Supporting Files/uk.lproj/Localizable.strings	
@@ -28,14 +28,14 @@
 "New version available" = "Доступна нова версія";
 "Click to install the new version of Stats" = "Натисніть щоб встановити нову версію Stats";
 "Successfully updated" = "Успішно оновленно";
-"Stats was updated to v" = "Stats оновлено до v%@";
+"Stats was updated to v" = "Stats оновлено до v%0";
 
 // Settings
 "Open Activity Monitor" = "Відкрити Монітор активності";
 "Report a bug" = "Повідомити про помилку";
 "Close application" = "Закрити програму";
 "Open application settings" = "Відкрити налаштування";
-"Open moduleName settings" = "Відкрити налаштування %@";
+"Open moduleName settings" = "Відкрити налаштування %0";
 
 // Application settings
 "Update application" = "Оновити програму";
@@ -62,7 +62,7 @@
 
 // Module Kit
 "Open module settings" = "Відкрити налаштування модуля";
-"Select widget" = "Активувати %@ віджет";
+"Select widget" = "Активувати %0 віджет";
 "Update interval" = "Інтервал обновлень";
 "Usage history" = "Історія використання";
 "Details" = "Деталі";
@@ -95,7 +95,7 @@
 
 // DiskF
 "Show removable disks" = "Показати зйомні диски";
-"Used disk memory" = "Використано %@ з %@";
+"Used disk memory" = "Використано %0 з %1";
 "Disk to show" = "Активний диск";
 
 // Network
@@ -114,6 +114,7 @@
 "Network interface" = "Мережевий інтерфейс";
 
 // Battery
+"Level" = "Рівень заряду";
 "Source" = "Джерело";
 "Time" = "Час";
 "Health" = "Стан акумулятора";
@@ -131,4 +132,4 @@
 "Not connected" = "Непід'єднана";
 "Low level notification" = "Повідомлення про низький рівень заряду";
 "Low battery" = "Низький заряд акумулятора";
-"Battery remaining" = "%@% залишилось";
+"Battery remaining" = "%0% залишилось";
diff --git a/StatsKit/extensions.swift b/StatsKit/extensions.swift
index f2630c98..df75e36b 100644
--- a/StatsKit/extensions.swift
+++ b/StatsKit/extensions.swift
@@ -956,8 +956,8 @@ public struct Log: TextOutputStream {
 public func LocalizedString(_ key: String, _ params: String..., comment: String = "") -> String {
     var string = NSLocalizedString(key, comment: comment)
     if !params.isEmpty {
-        for param in params {
-            string = string.replacingOccurrences(of: "%@", with: param)
+        for (index, param) in params.enumerated() {
+            string = string.replacingOccurrences(of: "%\(index)", with: param)
         }
     }
     return string