pygpt-net 2.4.37__py3-none-any.whl → 2.4.39__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 2.4.39 (2024-12-09)
+
+- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
+
+- Fixed: Language switch.
+
+## 2.4.38 (2024-12-08)
+
+- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
+- Added configuration options for audio input in Settings -> Audio -> Audio Input Device, Channels, and Sampling rate.
+
 ## 2.4.37 (2024-11-30)
 
 - The `Query only` mode in `Uploaded` tab has been renamed to `RAG`.

README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.37** | build: **2024.11.30** | Python: **>=3.10, <3.12**
+Release: **2.4.39** | build: **2024.12.09** | Python: **>=3.10, <3.12**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -2680,6 +2680,8 @@ Config -> Settings...
 
 - `Zoom`: Adjusts the zoom in chat window (web render view). `WebEngine / Chromium` render mode only.
 
+- `Style (chat)`: Chat style (Blocks, or ChatGPT-like, or ChatGPT-like Wide. `WebEngine / Chromium` render mode only.
+
 - `Code syntax highlight`: Syntax highlight theme in code blocks. `WebEngine / Chromium` render mode only.
 
 - `Font Size (chat window)`: Adjusts the font size in the chat window (plain-text) and notepads.
@@ -2702,8 +2704,6 @@ Config -> Settings...
 
 - `Use theme colors in chat window`: Use color theme in chat window, Default: True.
 
-- `Disable markdown formatting in output`: Enables plain-text display in output window, Default: False.
-
 **Files and attachments**
 
 - `Store attachments in the workdir upload directory`: Enable to store a local copy of uploaded attachments for future use. Default: True
@@ -2814,14 +2814,22 @@ Config -> Settings...
 
 **Vision**
 
+- `Vision: Camera Input Device`: Video capture camera index (index of the camera, default: 0).
+
 - `Vision: Camera capture width (px)`: Video capture resolution (width).
 
 - `Vision: Camera capture height (px)`: Video capture resolution (height).
 
-- `Vision: Camera IDX (number)`: Video capture camera index (number of camera).
-
 - `Vision: Image capture quality`: Video capture image JPEG quality (%).
 
+**Audio**
+
+- `Audio Input Device`: Selects the audio device for Microphone input.
+
+- `Channels`: Input channels, default: 1
+
+- `Sampling Rate`: Sampling rate, default: 44100
+
 **Indexes (LlamaIndex)**
 
 - `Indexes`: List of created indexes.
@@ -3865,6 +3873,17 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.39 (2024-12-09)**
+
+- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
+
+- Fixed: Language switch.
+
+**2.4.38 (2024-12-08)**
+
+- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
+- Added configuration options for audio input in Settings -> Audio -> Audio Input Device, Channels, and Sampling rate.
+
 **2.4.37 (2024-11-30)**
 
 - The `Query only` mode in `Uploaded` tab has been renamed to `RAG`.

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,14 @@
+2.4.39 (2024-12-09)
+
+- Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.
+
+- Fixed: Language switch.
+
+2.4.38 (2024-12-08)
+
+- Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...
+- Added configuration options for audio input in Settings -> Audio -> Audio Input Device, Channels, and Sampling rate.
+
 2.4.37 (2024-11-30)
 
 - The `Query only` mode in `Uploaded` tab has been renamed to `RAG`.

pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.30 01:00:00                  #
+# Updated Date: 2024.12.08 01:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.37"
-__build__ = "2024.11.30"
+__version__ = "2.4.39"
+__build__ = "2024.12.09"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __website__ = "https://pygpt.net"

pygpt_net/controller/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 17:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from pygpt_net.controller.access import Access
@@ -116,6 +116,7 @@ class Controller:
         self.calendar.setup()  # after everything is loaded
         self.painter.setup()  # load previous image if exists
         self.debug.post_setup()  # post setup debug after all loaded
+        self.ui.tabs.restore_data()  # restore opened tabs data
 
         # show license terms dialog
         if not self.window.core.config.get('license.accepted'):
@@ -168,6 +169,7 @@ class Controller:
         # post-reload
         self.ui.tabs.reload_after()
         self.ctx.reload_after()
+        self.ui.tabs.restore_data()  # restore opened tabs data
         self.kernel.restart()
 
         self.reloading = False  # unlock

pygpt_net/controller/calendar/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.tabs.tab import Tab
@@ -48,6 +48,8 @@ class Calendar:
 
         :param all: reload all notes
         """
+        if not self.is_loaded():
+            return
         year = self.window.ui.calendar['select'].currentYear
         month = self.window.ui.calendar['select'].currentMonth
         self.on_page_changed(year, month, all=all)  # load notes for current month

pygpt_net/controller/chat/render.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot, QTimer
@@ -16,6 +16,7 @@ from pygpt_net.core.render.base import BaseRenderer
 from pygpt_net.core.render.markdown.renderer import Renderer as MarkdownRenderer
 from pygpt_net.core.render.plain.renderer import Renderer as PlainTextRenderer
 from pygpt_net.core.render.web.renderer import Renderer as WebRenderer
+from pygpt_net.core.tabs import Tab
 from pygpt_net.core.text.utils import output_html2text, output_clean_html
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 
@@ -67,6 +68,7 @@ class Render:
         append = data.get("append", False)
         footer = data.get("footer", False)
         initialized = data.get("initialized", False)
+        tab = data.get("tab")
 
         if name == RenderEvent.BEGIN:
             self.begin(meta, ctx, stream)
@@ -87,7 +89,7 @@ class Render:
             self.stream_end(meta, ctx)
 
         elif name == RenderEvent.ON_PAGE_LOAD:
-            self.on_page_loaded(meta)
+            self.on_page_loaded(meta, tab)
         elif name ==RenderEvent.ON_THEME_CHANGE:
             self.on_theme_change()
         elif name == RenderEvent.ON_LOAD:
@@ -375,13 +377,14 @@ class Render:
         self.instance().on_reply_submit(ctx)
         self.update()
 
-    def on_page_loaded(self, meta: CtxMeta):
+    def on_page_loaded(self, meta: CtxMeta, tab: Tab = None):
         """
         On page loaded callback
 
         :param meta: context meta
+        :param tab: Tab
         """
-        self.instance().on_page_loaded(meta)  # TODO: send ID with callback
+        self.instance().on_page_loaded(meta, tab)
         self.update()
 
     def on_theme_change(self):
@@ -491,7 +494,7 @@ class Render:
         if plain:
             self.window.controller.theme.markdown.clear()
             for pid in self.window.ui.nodes['output_plain']:
-                if self.window.ui.nodes['output'][pid] is not None:
+                if self.window.ui.nodes['output_plain'][pid] is not None:
                     self.window.ui.nodes['output'][pid].setVisible(False)
                     self.window.ui.nodes['output_plain'][pid].setVisible(True)
         else:

pygpt_net/controller/config/placeholder.py

@@ -86,6 +86,8 @@ class Placeholder:
             return self.get_agent_providers()
         elif id == "syntax_styles":
             return self.get_syntax_styles()
+        elif id == "styles":
+            return self.get_styles()
         elif id == "idx":
             return self.get_idx()
         elif id == "keys":
@@ -98,9 +100,23 @@ class Placeholder:
             return self.get_speech_synthesis_actions()
         elif id == "voice_control_actions":
             return self.get_voice_control_actions()
+        elif id == "audio_input_devices":
+            return self.get_audio_input_devices()
         else:
             return []
 
+    def get_audio_input_devices(self) -> list:
+        """
+        Get audio input devices list
+
+        :return: placeholders list
+        """
+        devices = self.window.core.audio.get_input_devices()
+        data = []
+        for device in devices:
+            data.append({str(device[0]): device[1]})
+        return data
+
     def get_langchain_providers(self) -> list:
         """
         Get Langchain LLM provider placeholders list
@@ -276,6 +292,19 @@ class Placeholder:
             data.append({id: id})
         return data
 
+    def get_styles(self) -> list:
+        """
+        Get styles list
+
+        :return: placeholders list
+        """
+        styles = self.window.controller.theme.common.get_styles_list()
+        styles.sort()
+        data = []
+        for id in styles:
+            data.append({id: id})
+        return data
+
     def get_keys(self) -> list:
         """
         Get keys

pygpt_net/controller/ctx/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 00:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QModelIndex
@@ -60,20 +60,6 @@ class Ctx:
                 # if no ctx then get first ctx
                 self.window.core.ctx.set_current(self.window.core.ctx.get_first())
 
-        # restore previous ctx
-        # 1) try to load from tabs data - if not exists, load from current
-        tab = self.window.core.tabs.get_first_by_type(Tab.TAB_CHAT)
-        loaded = False
-        if tab is not None:
-            meta_id = tab.data_id
-            if meta_id is not None:
-                self.load(meta_id)
-                loaded = True
-
-        # 2) load from current if not loaded yet
-        if not loaded:
-            self.load(self.window.core.ctx.get_current())
-
         # restore search string if exists
         if self.window.core.config.has("ctx.search.string"):
             string = self.window.core.config.get("ctx.search.string")
@@ -144,6 +130,19 @@ class Ctx:
         # update additional context attachments
         self.window.controller.chat.attachment.update()
 
+    def select_on_list_only(self, id: int):
+        """
+        Select ctx by id only on list
+
+        :param id: context meta id
+        """
+        self.window.core.ctx.select(id, restore_model=True)
+        self.window.core.ctx.set_current(id)
+        self.update_list(True)
+        self.select_by_current()
+        self.reload_config(all=False)
+        self.update()
+
     def select_by_idx(self, idx: int):
         """
         Select ctx by index
@@ -348,6 +347,21 @@ class Ctx:
             event = RenderEvent(RenderEvent.ON_LOAD, data)
             self.window.dispatch(event)
 
+        self.reload_config()
+
+        # reload ctx list and select current ctx on list, without reloading all
+        self.update(reload=False, all=True)
+
+        # update tab title
+        if meta is not None:
+            self.window.controller.ui.tabs.update_title_current(meta.name)
+
+    def reload_config(self, all: bool = True):
+        """
+        Reload config
+
+        :param all: reload all
+        """
         # get current settings stored in ctx
         thread = self.window.core.ctx.get_thread()
         mode = self.window.core.ctx.get_mode()
@@ -358,8 +372,9 @@ class Ctx:
         # restore thread from ctx
         self.window.core.config.set('assistant_thread', thread)
 
-        # clear before output and append ctx to output
-        self.refresh_output()
+        if all:
+            # clear before output and append ctx to output
+            self.refresh_output()
 
         # switch mode to ctx mode
         if mode is not None:
@@ -384,16 +399,9 @@ class Ctx:
             if model is not None and self.window.core.models.has_model(mode, model):
                 self.window.controller.model.set(mode, model)
 
-        # reload ctx list and select current ctx on list, without reloading all
-        self.update(reload=False, all=True)
-
         # update current ctx label in UI
         self.common.update_label(mode, assistant_id)
 
-        # update tab title
-        if meta is not None:
-            self.window.controller.ui.tabs.update_title_current(meta.name)
-
     def update_ctx(self):
         """Update current ctx mode if allowed"""
         mode = self.window.core.config.get('mode')

pygpt_net/controller/ctx/common.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QApplication
@@ -91,10 +91,11 @@ class Common:
 
     def focus_chat(self):
         """Focus chat"""
+        tabs = self.window.ui.layout.get_active_tabs()
         if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_CHAT:
             idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_CHAT)
             if idx is not None:
-                self.window.ui.tabs['output'].setCurrentIndex(idx)
+                tabs.setCurrentIndex(idx)
 
     def restore_display_filter(self):
         """Restore display filter"""

pygpt_net/controller/dialogs/confirm.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 02:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 class Confirm:
@@ -154,7 +154,7 @@ class Confirm:
 
         # tab close all
         elif type == 'tab.close_all':
-            self.window.controller.ui.tabs.close_all(id, True)  # by type
+            self.window.controller.ui.tabs.close_all(id, 0, True)  # by type
 
         # editor
         elif type == 'editor.changed.clear':

pygpt_net/controller/lang/custom.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -37,12 +37,7 @@ class Custom:
 
     def apply(self):
         """Apply custom mappings"""
-        # output: tabs
-        # self.window.ui.tabs['output'].setTabText(0, trans('output.tab.chat'))
-        # self.window.ui.tabs['output'].setTabText(1, trans('output.tab.files'))
-        # self.window.ui.tabs['output'].setTabText(2, trans('output.tab.calendar'))
-        # self.window.ui.tabs['output'].setTabText(3, trans('output.tab.painter'))
-
+        
         # tool: indexer
         self.window.ui.tabs['tool.indexer'].setTabText(0, trans('tool.indexer.tab.files'))
         self.window.ui.tabs['tool.indexer'].setTabText(1, trans('tool.indexer.tab.web'))

pygpt_net/controller/lang/mapping.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from pygpt_net.utils import trans
@@ -332,6 +332,7 @@ class Mapping:
         menu_title['theme.light'] = 'menu.theme.light'
         menu_title['theme.syntax'] = 'menu.theme.syntax'
         menu_title['theme.density'] = 'menu.theme.density'
+        menu_title['theme.style'] = 'menu.theme.style'
         menu_title['menu.plugins'] = 'menu.plugins'
         menu_title['menu.plugins.presets'] = 'menu.plugins.presets'
         menu_title['menu.about'] = 'menu.info'
@@ -357,7 +358,6 @@ class Mapping:
         menu_text['config.profile.new'] = 'menu.config.profile.new'
         menu_text['config.save'] = 'menu.config.save'
         menu_text['theme.tooltips'] = 'menu.theme.tooltips'
-        menu_text['theme.blocks'] = 'menu.theme.blocks'
         menu_text['theme.settings'] = 'menu.theme.settings'
         menu_text['plugins.presets.new'] = 'menu.plugins.presets.new'
         menu_text['plugins.presets.edit'] = 'menu.plugins.presets.edit'

pygpt_net/controller/layout.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 03:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import os
@@ -26,7 +26,7 @@ class Layout:
         """
         self.window = window
         # self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "toolbox.presets"]
-        self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns"]
+        self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns", "columns"]
         self.text_nodes = ["input"]
 
     def setup(self):

pygpt_net/controller/notepad.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 17:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QTextCursor
@@ -183,10 +183,11 @@ class Notepad:
             return
 
         # switch to first notepad tab if current tab is not notepad
+        tabs = self.window.ui.layout.get_active_tabs()
         if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_NOTEPAD:
             idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_NOTEPAD)
             if idx is not None:
-                self.window.ui.tabs['output'].setCurrentIndex(idx)
+                tabs.setCurrentIndex(idx)
 
         self.window.activateWindow()  # focus
 
@@ -209,11 +210,12 @@ class Notepad:
         """
         if idx is None:
             idx = self.get_first_notepad_tab_idx()
+        tabs = self.window.ui.layout.get_active_tabs()
         tab = self.window.core.tabs.get_tab_by_index(idx)
         if tab is not None:
-            self.window.ui.tabs['output'].setCurrentIndex(idx)
+            tabs.setCurrentIndex(idx)
         else:
-            self.window.ui.tabs['output'].setCurrentIndex(self.get_first_notepad_tab_idx())
+            tabs.setCurrentIndex(self.get_first_notepad_tab_idx())
 
     def get_first_notepad_tab_idx(self) -> int:
         """
@@ -257,11 +259,12 @@ class Notepad:
             return True
         return False
 
-    def on_open(self, tab_idx: int):
+    def on_open(self, tab_idx: int, column_idx: int = 0):
         """
         On open notepad tab
 
         :param tab_idx: current tab idx
+        :param column_idx: column idx
         """
         tab = self.window.controller.ui.tabs.get_current_tab()
         if tab is None:

pygpt_net/controller/settings/editor.py

@@ -63,6 +63,7 @@ class Editor:
         self.window.ui.add_hook("update.config.debug", self.hook_update)
         self.window.ui.add_hook("update.config.notepad.num", self.hook_update)
         self.window.ui.add_hook("update.config.render.code_syntax", self.hook_update)
+        self.window.ui.add_hook("update.config.theme.style", self.hook_update)
         # self.window.ui.add_hook("llama.idx.storage", self.hook_update)  # vector store update
         # self.window.ui.add_hook("update.config.llama.idx.list", self.hook_update)
 
@@ -163,6 +164,11 @@ class Editor:
             value = self.window.core.config.get('render.code_syntax')
             self.window.controller.theme.toggle_syntax(value, update_menu=True)
 
+        # style
+        if self.config_changed('theme.style'):
+            value = self.window.core.config.get('theme.style')
+            self.window.controller.theme.toggle_style(value)
+
         # convert lists
         if self.config_changed('ctx.convert_lists'):
             self.window.controller.ctx.refresh()

pygpt_net/controller/theme/__init__.py

@@ -6,17 +6,17 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 import os
 
+from pygpt_net.core.events import RenderEvent
+
 from .common import Common
 from .markdown import Markdown
 from .menu import Menu
 from .nodes import Nodes
-from ...core.events import RenderEvent
-
 
 class Theme:
     def __init__(self, window=None):
@@ -68,11 +68,22 @@ class Theme:
         # update themes menu
         self.menu.update_list()
         self.menu.update_syntax()
-        self.window.ui.menu['theme.blocks'].setChecked(self.window.core.config.get("render.blocks"))
 
         if force:
             self.window.controller.ui.restore_state()  # restore state after theme change
 
+    def toggle_style(self, name: str):
+        """
+        Toggle theme style (web)
+
+        :param name: web style name
+        """
+        self.window.core.config.set('theme.style', name)
+        self.window.core.config.save()
+        event = RenderEvent(RenderEvent.ON_THEME_CHANGE)
+        self.window.dispatch(event)
+        self.reload()
+
     def toggle_option(self, name: str, value: any = None):
         """
         Toggle theme menu option
@@ -120,10 +131,24 @@ class Theme:
         if update_menu:
             self.menu.update_syntax()
 
+    def update_style(self):
+        """Update style"""
+        current = self.window.core.config.get('theme.style')
+        self.toggle_style(current)
+
+    def update_theme(self, force: bool = True):
+        """
+        Update theme
+
+        :param force: force theme change (manual trigger)
+        """
+        current = self.window.core.config.get('theme')
+        self.toggle(current, force=force)
+
     def update_syntax(self):
         """Update syntax menu"""
-        curr = self.window.core.config.get('render.code_syntax')
-        self.toggle_syntax(curr, update_menu=True)
+        current = self.window.core.config.get('render.code_syntax')
+        self.toggle_syntax(current, update_menu=True)
 
     def reload(self, force: bool = True):
         """
@@ -131,8 +156,7 @@ class Theme:
 
         :param force: force theme change (manual trigger)
         """
-        current = self.window.core.config.get('theme')
-        self.toggle(current, force=force)
+        self.update_theme(force=force)
 
     def apply(self, theme: str = 'dark_teal.xml', custom: str = None):
         """
@@ -183,4 +207,5 @@ class Theme:
     def reload_all(self):
         """Reload all"""
         self.setup()
+        self.update_style()
         self.update_syntax()