diff --git a/src/ThemeManager/DesktopTheme.py b/src/ThemeManager/DesktopTheme.py
index 36ef3a3..74768f2 100644
--- a/src/ThemeManager/DesktopTheme.py
+++ b/src/ThemeManager/DesktopTheme.py
@@ -54,7 +54,7 @@ def set_gsetting(self, schema: str, key: str, value: str):
         try:
             subprocess.run(cmd, shell=True, check=True)
         except subprocess.CalledProcessError:
-            logger.warning(_("Failed to set gsetting: %s %s"), schema, key)
+            logger.warning(_("Failed to set gsetting: {schema} {key}").format(schema=schema, key=key))
 
     def write_schema_to_xml(self, schema_id: str, output_file: Path):
         """Generate missing schema XML if user-theme is absent."""
diff --git a/src/ThemeManager/main.py b/src/ThemeManager/main.py
index 459f1f5..8dc905b 100644
--- a/src/ThemeManager/main.py
+++ b/src/ThemeManager/main.py
@@ -43,7 +43,7 @@
 # Set logging level
 logger.setLevel(logging.DEBUG)
 # create log formatter
-log_format = logging.Formatter('%(asctime)s %(name)s - %(levelname)s: %(message)s')
+log_format = logging.Formatter('%(asctime)s %(name)s:%(lineno)d - %(levelname)s: %(message)s')
 
 # create file handler which logs only info messages
 fHandler = logging.FileHandler(LOGFILE)
diff --git a/src/ThemeManager/tm_daemon.py b/src/ThemeManager/tm_daemon.py
index 6b0f5d8..207b110 100644
--- a/src/ThemeManager/tm_daemon.py
+++ b/src/ThemeManager/tm_daemon.py
@@ -76,10 +76,10 @@ def _monitor_state_change(self):
             try:
                 state = self.manager.get_state_info()
                 current_state = state.get("State", "unknown").lower()
-                logger.debug(_("Current state: %s, Last: %s"), current_state, self.last_state)
+                logger.debug(_("Current state: {cs}, Last: {ls}").format(cs=current_state, ls=self.last_state))
 
                 if current_state != self.last_state:
-                    logger.info(_("State changed: %s → %s"), self.last_state, current_state)
+                    logger.info(_("State changed: {ls} → {cs}").format(ls=self.last_state, cs=current_state))
                     self.last_state = current_state
                     self._update_theme()