          self._opt_name = opt_name
          self.tk_var = tk_var
          self.frame = control_frame
          self.browser = sysbrowser_dict["browser"]
          self.filetypes = sysbrowser_dict["filetypes"]
          self.action_option = self.format_action_option(sysbrowser_dict.get("action_option", None))
          self.command = sysbrowser_dict.get("command", None)
          self.destination = sysbrowser_dict.get("destination", None)
 
</s> remove     def __init__(self, opt_name, tk_var, control_frame, sysbrowser_dict):
        logger.debug("Initializing: %s: (tk_var: %s, control_frame: %s, sysbrowser_dict: %s)",
                     self.__class__.__name__, tk_var, control_frame, sysbrowser_dict)
 </s> add     def __init__(self, opt_name, tk_var, control_frame, sysbrowser_dict, style):
        logger.debug("Initializing: %s: (tk_var: %s, control_frame: %s, sysbrowser_dict: %s, "
                     "style: %s)", self.__class__.__name__, tk_var, control_frame,
                     sysbrowser_dict, style) </s> remove         self._style = style
 </s> add         # Default to Control Panel Style
        self._style = style = style if style else "CPanel." </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"])
        self._style = style
          self._opt_name = opt_name
          self.tk_var = tk_var
          self.frame = control_frame
        self._style = style
          self.browser = sysbrowser_dict["browser"]
          self.filetypes = sysbrowser_dict["filetypes"]
          self.action_option = self.format_action_option(sysbrowser_dict.get("action_option", None))
          self.command = sysbrowser_dict.get("command", None)
          self.destination = sysbrowser_dict.get("destination", None)
keep keep add 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