diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index ffe7c770d..852bd36d1 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -42,10 +42,7 @@ const
 
 	getNotificationMessage = code => {
 		let key = getKeyByValue(Notification, code);
-		if (key) {
-			key = i18nKey(key).replace('_NOTIFICATION', '_ERROR');
-			return I18N_DATA.NOTIFICATIONS[key];
-		}
+		return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
 	};
 
 export const
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 3ca8b4361..98cc9cffd 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -43,10 +43,8 @@ export const
 			clearTimer = () => {
 				__themeTimer = setTimeout(() => themeTrigger(SaveSettingsStep.Idle), 1000);
 				__themeJson = null;
-			};
-
-		let url = themeStyle.dataset.href.replace(/(Admin|User)\/-\/[^/]+\//, '$1/-/' + value + '/')
-			+ 'Json/';
+			},
+			url = themeStyle.dataset.href.replace(/(Admin|User)\/-\/[^/]+\//, '$1/-/' + value + '/') + 'Json/';
 
 		clearTimeout(__themeTimer);
 
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index 95f17f13a..4864ef04f 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -9,17 +9,17 @@ export const ThemeStore = {
 	userBackgroundHash: ko.observable(''),
 	isMobile: ko.observable($htmlCL.contains('rl-mobile')),
 
-	populate: function(){
+	populate: () => {
 		const themes = Settings.app('themes');
 
-		this.themes(isArray(themes) ? themes : []);
-		this.theme(SettingsGet('Theme'));
-		if (!this.isMobile()) {
-			this.userBackgroundName(SettingsGet('UserBackgroundName'));
-			this.userBackgroundHash(SettingsGet('UserBackgroundHash'));
+		ThemeStore.themes(isArray(themes) ? themes : []);
+		ThemeStore.theme(SettingsGet('Theme'));
+		if (!ThemeStore.isMobile()) {
+			ThemeStore.userBackgroundName(SettingsGet('UserBackgroundName'));
+			ThemeStore.userBackgroundHash(SettingsGet('UserBackgroundHash'));
 		}
 
-		leftPanelDisabled(this.isMobile());
+		leftPanelDisabled(ThemeStore.isMobile());
 	}
 };
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 25a5e3939..92fa46634 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -67,12 +67,9 @@ abstract class AbstractConfig implements \JsonSerializable
 	 */
 	public function Get(string $sSection, string $sName, $mDefault = null)
 	{
-		$mResult = $mDefault;
-		if (isset($this->aData[$sSection][$sName][0]))
-		{
-			$mResult = $this->aData[$sSection][$sName][0];
-		}
-		return $mResult;
+		return isset($this->aData[$sSection][$sName][0])
+			? $this->aData[$sSection][$sName][0]
+			: $mDefault;
 	}
 
 	/**
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 3096bd5ef..27bfeee6d 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -17,7 +17,6 @@
   font-weight: normal !important;
   font-variant: normal !important;
   line-height: 1;
-  text-transform: none !important;
   speak: never;
   -webkit-font-smoothing: antialiased;
 }