          self.option_columns = option_columns
          self.helpset = False
          self.label_width = label_width
          self.filebrowser = None
          self._style = style
  
          self.frame = self.control_frame(parent)
          self.chkbtns = checkbuttons_frame
  
          self.set_tk_var(blank_nones)
 
</s> remove         canvas_kwargs = dict(bd=0, highlightthickness=0)
        if self._style == "CPanel.":
            canvas_kwargs["bg"] = "#CDD3D5"
        if self._style == "SPanel.":
            canvas_kwargs["bg"] = "#DAD2D8"
 </s> add         lookup = "settings_popup" if self._style.startswith("SPanel") else "control_panel"
        theme = get_config().user_theme[lookup]
        canvas_kwargs = dict(bd=0, highlightthickness=0, bg=theme["secondary_color"]) </s> remove                                            self.option.sysbrowser)
 </s> add                                            self.option.sysbrowser,
                                           self._style)

        theme = get_config().user_theme["group_box"]
        if self.option.control == tk.Entry:
            ctl = self.option.control(self.frame,
                                      textvariable=self.option.tk_var,
                                      font=get_config().default_font,
                                      bg=theme["input_color"],
                                      fg=theme["input_font"],
                                      highlightbackground=theme["input_font"],
                                      highlightthickness=1,
                                      bd=0)
        else:  # Combobox
            ctl = self.option.control(self.frame,
                                      textvariable=self.option.tk_var,
                                      font=get_config().default_font,
                                      state="readonly",
                                      style="Group.TCombobox")

            # Style for combo list boxes needs to be set directly on widget as no style parameter
            key = "settings_popup" if self._style.startswith("SPanel") else "control_panel"
            select_key = get_config().user_theme[key]
            cmd = f"[ttk::combobox::PopdownWindow {ctl}].f.l configure -"
            ctl.tk.eval(f"{cmd}foreground {theme['font_color']}")
            ctl.tk.eval(f"{cmd}background {theme['background']}")
            ctl.tk.eval(f"{cmd}selectforeground {select_key['header_color']}")
            ctl.tk.eval(f"{cmd}selectbackground {select_key['secondary_color']}") </s> remove             ctl = ttk.Radiobutton if option_type == "radio" else MultiOption
            style = f"{self._style}T{'Radiobutton' if option_type == 'radio' else 'Checkbutton'}"
 </s> add             if option_type == "radio":
                ctl = ttk.Radiobutton
                style = "Group.TRadiobutton"
            else:
                ctl = MultiOption
                style = "Group.TCheckbutton"

        # Default to Control Panel Style
        self._style = style = style if style else "CPanel."
          self.option_columns = option_columns
          self.helpset = False
          self.label_width = label_width
          self.filebrowser = None
        # Default to Control Panel Style
        self._style = style = style if style else "CPanel."
  
          self.frame = self.control_frame(parent)
          self.chkbtns = checkbuttons_frame
  
          self.set_tk_var(blank_nones)
keep keep keep keep replace keep keep keep keep keep
 GUI updates
  - Control panel fixes
  - Basic themeing support
  - Fix tools to display more natively
  - Give all config items a group 
lib/gui/control_helper.py