From 598e50be1de20b4a18a36fe24703718b9418a28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Wed, 30 Nov 2022 16:29:44 -0300
Subject: [PATCH 01/31] Fix brush icon scale for brush size button when
 guiscale is greater than 1

---
 src/app/ui/brush_popup.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/ui/brush_popup.cpp b/src/app/ui/brush_popup.cpp
index 62e0c543d..f24318f3c 100644
--- a/src/app/ui/brush_popup.cpp
+++ b/src/app/ui/brush_popup.cpp
@@ -493,6 +493,8 @@ os::SurfaceRef BrushPopup::createSurfaceForBrush(const BrushRef& origBrush,
 
     if (image->pixelFormat() == IMAGE_BITMAP)
       delete palette;
+
+    surface->applyScale(guiscale());
   }
   else {
     surface->clear();

From 11dc816878461979bdbe6a98e4fd6bb08d07bfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Wed, 30 Nov 2022 16:46:40 -0300
Subject: [PATCH 02/31] Add "capture" state to style layer states

---
 src/app/ui/skin/skin_theme.cpp | 1 +
 src/ui/style.h                 | 1 +
 src/ui/theme.cpp               | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index d0e1f9c9f..accd31370 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -666,6 +666,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
           if (state.find("selected") != std::string::npos) flags |= ui::Style::Layer::kSelected;
           if (state.find("focus") != std::string::npos) flags |= ui::Style::Layer::kFocus;
           if (state.find("mouse") != std::string::npos) flags |= ui::Style::Layer::kMouse;
+          if (state.find("capture") != std::string::npos) flags |= ui::Style::Layer::kCapture;
           layer.setFlags(flags);
         }
 
diff --git a/src/ui/style.h b/src/ui/style.h
index 441488089..d93c6bae5 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -48,6 +48,7 @@ namespace ui {
         kFocus = 2,
         kSelected = 4,
         kDisabled = 8,
+        kCapture = 16
       };
 
       Layer()
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 1e057388a..861686cdd 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -123,7 +123,8 @@ int PaintWidgetPartInfo::getStyleFlagsForWidget(const Widget* widget)
     (widget->isEnabled() ? 0: Style::Layer::kDisabled) |
     (widget->isSelected() ? Style::Layer::kSelected: 0) |
     (widget->hasMouse() ? Style::Layer::kMouse: 0) |
-    (widget->hasFocus() ? Style::Layer::kFocus: 0);
+    (widget->hasFocus() ? Style::Layer::kFocus: 0) |
+    (widget->hasCapture() ? Style::Layer::kCapture: 0);
 }
 
 Theme::Theme()

From 195a8d0e92cdd0f852e0da18c077c6b31c0cf2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Fri, 2 Dec 2022 11:15:56 -0300
Subject: [PATCH 03/31] Fix border, margin, and padding attributes inheritance

---
 src/app/ui/skin/skin_theme.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index accd31370..911edcedc 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -582,7 +582,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("margin-top");
         const char* r = xmlStyle->Attribute("margin-right");
         const char* b = xmlStyle->Attribute("margin-bottom");
-        gfx::Border margin = ui::Style::UndefinedBorder();
+        gfx::Border margin = style->margin();
         if (m || l) margin.left(scale*std::strtol(l ? l: m, nullptr, 10));
         if (m || t) margin.top(scale*std::strtol(t ? t: m, nullptr, 10));
         if (m || r) margin.right(scale*std::strtol(r ? r: m, nullptr, 10));
@@ -597,7 +597,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("border-top");
         const char* r = xmlStyle->Attribute("border-right");
         const char* b = xmlStyle->Attribute("border-bottom");
-        gfx::Border border = ui::Style::UndefinedBorder();
+        gfx::Border border = style->border();
         if (m || l) border.left(scale*std::strtol(l ? l: m, nullptr, 10));
         if (m || t) border.top(scale*std::strtol(t ? t: m, nullptr, 10));
         if (m || r) border.right(scale*std::strtol(r ? r: m, nullptr, 10));
@@ -612,7 +612,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         const char* t = xmlStyle->Attribute("padding-top");
         const char* r = xmlStyle->Attribute("padding-right");
         const char* b = xmlStyle->Attribute("padding-bottom");
-        gfx::Border padding = ui::Style::UndefinedBorder();
+        gfx::Border padding = style->padding();
         if (m || l) padding.left(scale*std::strtol(l ? l: m, nullptr, 10));
         if (m || t) padding.top(scale*std::strtol(t ? t: m, nullptr, 10));
         if (m || r) padding.right(scale*std::strtol(r ? r: m, nullptr, 10));

From dded1f6eae97cd14efff47efa9745b34bf246708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Fri, 2 Dec 2022 15:13:45 -0300
Subject: [PATCH 04/31] Add mnemonics attribute for font and styles to
 enable/disable accelerators underlining

---
 data/extensions/aseprite-theme/theme.xml |  2 +-
 src/app/ui/skin/skin_theme.cpp           | 17 ++++++++++++++---
 src/app/ui/skin/skin_theme.h             | 13 ++++++++++++-
 src/ui/style.cpp                         |  1 +
 src/ui/style.h                           |  3 +++
 src/ui/theme.cpp                         |  2 +-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index de277a9ee..d9f664434 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -6,7 +6,7 @@
     </authors>
     <fonts>
         <font id="default" font="Aseprite" />
-        <font id="mini" font="Aseprite Mini" />
+        <font id="mini" font="Aseprite Mini" mnemonics="off" />
     </fonts>
     <dimensions>
         <dim id="scrollbar_size" value="12" />
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 911edcedc..0b5658b25 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -409,8 +409,11 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         if (sizeStr)
           size = std::strtol(sizeStr, nullptr, 10);
 
+        const char* mnemonicsStr = xmlFont->Attribute("mnemonics");
+        bool mnemonics = mnemonicsStr ? (std::string(mnemonicsStr) != "off") : true;
+
         os::FontRef font = fontData->getFont(size);
-        m_themeFonts[idStr] = font;
+        m_themeFonts[idStr] = ThemeFont(font, mnemonics);
 
         if (id == "default")
           m_defaultFont = font;
@@ -624,8 +627,16 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
       {
         const char* fontId = xmlStyle->Attribute("font");
         if (fontId) {
-          os::FontRef font = m_themeFonts[fontId];
-          style->setFont(font);
+          auto themeFont = m_themeFonts[fontId];
+          style->setFont(themeFont.font());
+          style->setMnemonics(themeFont.mnemonics());
+        }
+
+        // Override mnemonics value if it is defined for this style.
+        const char* mnemonicsStr = xmlStyle->Attribute("mnemonics");
+        if (mnemonicsStr) {
+          bool mnemonics = mnemonicsStr ? (std::string(mnemonicsStr) != "off") : true;
+          style->setMnemonics(mnemonics);
         }
       }
 
diff --git a/src/app/ui/skin/skin_theme.h b/src/app/ui/skin/skin_theme.h
index 5a21f2a65..48e7edb77 100644
--- a/src/app/ui/skin/skin_theme.h
+++ b/src/app/ui/skin/skin_theme.h
@@ -34,6 +34,17 @@ namespace app {
 
     class FontData;
 
+    class ThemeFont {
+      public:
+        ThemeFont() {}
+        ThemeFont(os::FontRef font, bool mnemonics) : m_font(font), m_mnemonics(mnemonics) {}
+        os::FontRef font() { return m_font; }
+        bool mnemonics() { return m_mnemonics; }
+      private:
+        os::FontRef m_font;
+        bool m_mnemonics;
+    };
+
     // This is the GUI theme used by Aseprite (which use images from
     // data/skins directory).
     class SkinTheme : public ui::Theme
@@ -161,7 +172,7 @@ namespace app {
       std::array<ui::Cursor*, ui::kCursorTypes> m_standardCursors;
       std::map<std::string, ui::Style*> m_styles;
       std::map<std::string, FontData*> m_fonts;
-      std::map<std::string, os::FontRef> m_themeFonts;
+      std::map<std::string, ThemeFont> m_themeFonts;
       os::FontRef m_defaultFont;
       os::FontRef m_miniFont;
       int m_preferredScreenScaling;
diff --git a/src/ui/style.cpp b/src/ui/style.cpp
index 583922579..e2b73b516 100644
--- a/src/ui/style.cpp
+++ b/src/ui/style.cpp
@@ -27,6 +27,7 @@ Style::Style(const Style* base)
   , m_border(base ? base->border(): Style::UndefinedBorder())
   , m_padding(base ? base->padding(): Style::UndefinedBorder())
   , m_font(nullptr)
+  , m_mnemonics(base ? base->mnemonics() : true)
 {
   if (base)
     m_layers = base->layers();
diff --git a/src/ui/style.h b/src/ui/style.h
index d93c6bae5..64deada9e 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -105,6 +105,7 @@ namespace ui {
     const gfx::Border& border() const { return m_border; }
     const gfx::Border& padding() const { return m_padding; }
     os::Font* font() const { return m_font.get(); }
+    const bool mnemonics() const { return m_mnemonics; }
     const Layers& layers() const { return m_layers; }
     Layers& layers() { return m_layers; }
 
@@ -113,6 +114,7 @@ namespace ui {
     void setBorder(const gfx::Border& value) { m_border = value; }
     void setPadding(const gfx::Border& value) { m_padding = value; }
     void setFont(const os::FontRef& font);
+    void setMnemonics(const bool enabled) { m_mnemonics = enabled; }
     void addLayer(const Layer& layer);
 
   private:
@@ -123,6 +125,7 @@ namespace ui {
     gfx::Border m_border;
     gfx::Border m_padding;
     os::FontRef m_font;
+    bool m_mnemonics;
   };
 
 } // namespace ui
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 861686cdd..6978a296a 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -464,7 +464,7 @@ void Theme::paintLayer(Graphics* g,
           g->drawUIText(text,
                         layer.color(),
                         bgColor,
-                        pt, mnemonic);
+                        pt, style->mnemonics() ? mnemonic : 0);
         }
 
         if (style->font())

From e002316466b0886da3c21147692d216436501c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 5 Dec 2022 17:51:07 -0300
Subject: [PATCH 05/31] Take into account padding when painting text and icon
 layers

---
 data/extensions/aseprite-theme/theme.xml |  2 +-
 src/ui/theme.cpp                         | 36 ++++++++++++++++--------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index d9f664434..b84421616 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1008,7 +1008,7 @@
             <text color="slider_empty_text" align="center middle" />
             <text color="slider_empty_text" align="center middle" state="focus" y="1" />
         </style>
-        <style id="mini_slider" extends="slider" font="mini" padding-top="1" padding-bottom="3">
+        <style id="mini_slider" extends="slider" font="mini">
             <background part="mini_slider_empty" />
             <text color="slider_empty_text" align="center middle" />
             <text color="slider_empty_text" align="center middle" state="focus" />
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 6978a296a..d9c9a3601 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -444,20 +444,26 @@ void Theme::paintLayer(Graphics* g,
         else {
           gfx::Size textSize = g->measureUIText(text);
           gfx::Point pt;
+          gfx::Border undef = Style::UndefinedBorder();
+          gfx::Border padding = style->padding();
+          if (padding.left() == undef.left()) padding.left(0);
+          if (padding.right() == undef.right()) padding.right(0);
+          if (padding.top() == undef.top()) padding.top(0);
+          if (padding.bottom() == undef.bottom()) padding.bottom(0);
 
           if (layer.align() & LEFT)
-            pt.x = rc.x;
+            pt.x = rc.x+padding.left();
           else if (layer.align() & RIGHT)
-            pt.x = rc.x+rc.w-textSize.w;
+            pt.x = rc.x+rc.w-textSize.w-padding.right();
           else
-            pt.x = rc.x+rc.w/2-textSize.w/2;
+            pt.x = rc.x+padding.left()+(rc.w-padding.width())/2-textSize.w/2;
 
           if (layer.align() & TOP)
-            pt.y = rc.y;
+            pt.y = rc.y+padding.top();
           else if (layer.align() & BOTTOM)
-            pt.y = rc.y+rc.h-textSize.h;
+            pt.y = rc.y+rc.h-textSize.h-padding.bottom();
           else
-            pt.y = rc.y+rc.h/2-textSize.h/2;
+            pt.y = rc.y+padding.top()+(rc.h-padding.height())/2-textSize.h/2;
 
           pt += layer.offset();
 
@@ -477,20 +483,26 @@ void Theme::paintLayer(Graphics* g,
       if (icon) {
         gfx::Size iconSize(icon->width(), icon->height());
         gfx::Point pt;
+        gfx::Border undef = Style::UndefinedBorder();
+        gfx::Border padding = style->padding();
+        if (padding.left() == undef.left()) padding.left(0);
+        if (padding.right() == undef.right()) padding.right(0);
+        if (padding.top() == undef.top()) padding.top(0);
+        if (padding.bottom() == undef.bottom()) padding.bottom(0);
 
         if (layer.align() & LEFT)
-          pt.x = rc.x;
+          pt.x = rc.x+padding.left();
         else if (layer.align() & RIGHT)
-          pt.x = rc.x+rc.w-iconSize.w;
+          pt.x = rc.x+rc.w-iconSize.w-padding.right();
         else
-          pt.x = rc.x+rc.w/2-iconSize.w/2;
+          pt.x = rc.x+padding.left()+(rc.w-padding.width())/2-iconSize.w/2;
 
         if (layer.align() & TOP)
-          pt.y = rc.y;
+          pt.y = rc.y+padding.top();
         else if (layer.align() & BOTTOM)
-          pt.y = rc.y+rc.h-iconSize.h;
+          pt.y = rc.y+rc.h-iconSize.h-padding.bottom();
         else
-          pt.y = rc.y+rc.h/2-iconSize.h/2;
+          pt.y = rc.y+padding.top()+(rc.h-padding.height())/2-iconSize.h/2;
 
         pt += layer.offset();
 

From d3f01ebe171201e951207e3a03f4b26f7e2d5fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Wed, 7 Dec 2022 15:41:33 -0300
Subject: [PATCH 06/31] Add width, height, minwidth, minheight, maxwidth, and
 maxheight attributes to styles

---
 src/app/ui/skin/skin_theme.cpp | 25 +++++++++++++++++++++++++
 src/ui/style.cpp               | 28 ++++++++++++++++++++++++++++
 src/ui/style.h                 | 11 +++++++++++
 src/ui/theme.cpp               | 31 +++++++++++++++++++++++++++++++
 src/ui/theme.h                 |  4 ++++
 src/ui/widget.cpp              |  2 ++
 6 files changed, 101 insertions(+)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 0b5658b25..ab452b604 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -623,6 +623,31 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         style->setPadding(padding);
       }
 
+      // Size
+      {
+        const char* width     = xmlStyle->Attribute("width");
+        const char* height    = xmlStyle->Attribute("height");
+        const char* minwidth  = xmlStyle->Attribute("minwidth");
+        const char* minheight = xmlStyle->Attribute("minheight");
+        const char* maxwidth  = xmlStyle->Attribute("maxwidth");
+        const char* maxheight = xmlStyle->Attribute("maxheight");
+        gfx::Size minSize = style->minSize();
+        gfx::Size maxSize = style->maxSize();
+        if (width) {
+          if (!minwidth) minwidth = width;
+          if (!maxwidth) maxwidth = width;
+        }
+        if (height) {
+          if (!minheight) minheight = height;
+          if (!maxheight) maxheight = height;
+        }
+        if (minwidth) minSize.w = scale*std::strtol(minwidth, nullptr, 10);
+        if (minheight) minSize.h = scale*std::strtol(minheight, nullptr, 10);
+        if (maxwidth) maxSize.w = scale*std::strtol(maxwidth, nullptr, 10);
+        if (maxheight) maxSize.h = scale*std::strtol(maxheight, nullptr, 10);
+        style->setMinSize(minSize);
+        style->setMaxSize(maxSize);
+      }
       // Font
       {
         const char* fontId = xmlStyle->Attribute("font");
diff --git a/src/ui/style.cpp b/src/ui/style.cpp
index e2b73b516..3e119da81 100644
--- a/src/ui/style.cpp
+++ b/src/ui/style.cpp
@@ -21,11 +21,25 @@ gfx::Border Style::UndefinedBorder()
   return gfx::Border(-1, -1, -1, -1);
 }
 
+// static
+gfx::Size Style::MinSize()
+{
+  return gfx::Size(0, 0);
+}
+
+// static
+gfx::Size Style::MaxSize()
+{
+  return gfx::Size(std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
+}
+
 Style::Style(const Style* base)
   : m_insertionPoint(0)
   , m_margin(base ? base->margin(): Style::UndefinedBorder())
   , m_border(base ? base->border(): Style::UndefinedBorder())
   , m_padding(base ? base->padding(): Style::UndefinedBorder())
+  , m_minSize(base ? base->minSize(): Style::MinSize())
+  , m_maxSize(base ? base->maxSize(): Style::MaxSize())
   , m_font(nullptr)
   , m_mnemonics(base ? base->mnemonics() : true)
 {
@@ -33,6 +47,20 @@ Style::Style(const Style* base)
     m_layers = base->layers();
 }
 
+void Style::setMinSize(const gfx::Size& sz)
+{
+  ASSERT(sz.w <= m_maxSize.w);
+  ASSERT(sz.h <= m_maxSize.h);
+  m_minSize = sz;
+}
+
+void Style::setMaxSize(const gfx::Size& sz)
+{
+  ASSERT(sz.w >= m_minSize.w);
+  ASSERT(sz.h >= m_minSize.h);
+  m_maxSize = sz;
+}
+
 void Style::setFont(const os::Ref<os::Font>& font)
 {
   m_font = font;
diff --git a/src/ui/style.h b/src/ui/style.h
index 64deada9e..8f3bbc5e5 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -98,12 +98,17 @@ namespace ui {
 
     static gfx::Border UndefinedBorder();
 
+    static gfx::Size MinSize();
+    static gfx::Size MaxSize();
+
     Style(const Style* base);
 
     const std::string& id() const { return m_id; }
     const gfx::Border& margin() const { return m_margin; }
     const gfx::Border& border() const { return m_border; }
     const gfx::Border& padding() const { return m_padding; }
+    const gfx::Size& minSize() const { return m_minSize; }
+    const gfx::Size& maxSize() const { return m_maxSize; }
     os::Font* font() const { return m_font.get(); }
     const bool mnemonics() const { return m_mnemonics; }
     const Layers& layers() const { return m_layers; }
@@ -113,6 +118,8 @@ namespace ui {
     void setMargin(const gfx::Border& value) { m_margin = value; }
     void setBorder(const gfx::Border& value) { m_border = value; }
     void setPadding(const gfx::Border& value) { m_padding = value; }
+    void setMinSize(const gfx::Size& sz);
+    void setMaxSize(const gfx::Size& sz);
     void setFont(const os::FontRef& font);
     void setMnemonics(const bool enabled) { m_mnemonics = enabled; }
     void addLayer(const Layer& layer);
@@ -124,6 +131,10 @@ namespace ui {
     gfx::Border m_margin;
     gfx::Border m_border;
     gfx::Border m_padding;
+    // Min width and height for the widget.
+    gfx::Size m_minSize;
+    // Max width and height for the widget.
+    gfx::Size m_maxSize;
     os::FontRef m_font;
     bool m_mnemonics;
   };
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index d9c9a3601..8388aefed 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -663,6 +663,34 @@ gfx::Color Theme::calcBgColor(const Widget* widget,
   return bgColor;
 }
 
+gfx::Size Theme::calcMinSize(const Widget* widget,
+                              const Style* style)
+{
+  ASSERT(widget);
+  ASSERT(style);
+
+  gfx::Size sz = widget->minSize();
+
+  if (sz.w == 0) sz.w = style->minSize().w;
+  if (sz.h == 0) sz.h = style->minSize().h;
+
+  return sz;
+}
+
+gfx::Size Theme::calcMaxSize(const Widget* widget,
+                              const Style* style)
+{
+  ASSERT(widget);
+  ASSERT(style);
+
+  gfx::Size sz = widget->maxSize();
+
+  if (sz.w == std::numeric_limits<int>::max()) sz.w = style->maxSize().w;
+  if (sz.h == std::numeric_limits<int>::max()) sz.h = style->maxSize().h;
+
+  return sz;
+}
+
 void Theme::calcWidgetMetrics(const Widget* widget,
                               const Style* style,
                               gfx::Size& sizeHint,
@@ -718,6 +746,9 @@ void Theme::calcWidgetMetrics(const Widget* widget,
     sizeHint.h += std::max(textHint.h, iconHint.h);
   else
     sizeHint.h += textHint.h + iconHint.h;
+
+  sizeHint.w = std::clamp(sizeHint.w, widget->minSize().w, widget->maxSize().w);
+  sizeHint.h = std::clamp(sizeHint.h, widget->minSize().h, widget->maxSize().h);
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/ui/theme.h b/src/ui/theme.h
index fe5349af2..d1260834f 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -119,6 +119,10 @@ namespace ui {
                               gfx::Rect& textBounds, int& textAlign);
     virtual gfx::Color calcBgColor(const Widget* widget,
                                    const Style* style);
+    virtual gfx::Size calcMinSize(const Widget* widget,
+                                  const Style* style);
+    virtual gfx::Size calcMaxSize(const Widget* widget,
+                                  const Style* style);
 
     static void drawSlices(Graphics* g,
                            os::Surface* sheet,
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 3bf495e0c..e538b2807 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -203,6 +203,8 @@ void Widget::setStyle(Style* style)
   m_style = style;
   m_border = m_theme->calcBorder(this, style);
   m_bgColor = m_theme->calcBgColor(this, style);
+  m_minSize = m_theme->calcMinSize(this, style);
+  m_maxSize = m_theme->calcMaxSize(this, style);
   if (style->font())
     m_font = AddRef(style->font());
 }

From 1783704a53854bfeb830efe7262f1a38df0a6519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Wed, 7 Dec 2022 15:47:14 -0300
Subject: [PATCH 07/31] Fix positioning of text and icon layers to avoid
 setting values that are not a multiple of the gui scale

---
 data/extensions/aseprite-theme/theme.xml | 22 +++++++++---------
 src/ui/theme.cpp                         | 16 +++++++++----
 src/ui/theme.h                           |  3 +++
 src/ui/widget.cpp                        | 29 +++++++++++++++++-------
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index b84421616..e52307ee2 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -543,9 +543,9 @@
             <background-border part="button_hot" state="mouse" />
             <background-border part="button_selected" state="selected" />
             <icon part="warning_box" align="right" />
-            <text color="button_normal_text" align="left" />
-            <text color="button_hot_text" align="left" state="mouse" />
-            <text color="button_selected_text" align="left" state="selected" />
+            <text color="button_normal_text" align="left" y="1" />
+            <text color="button_hot_text" align="left" y="1" state="mouse" />
+            <text color="button_selected_text" align="left" y="1" state="selected" />
         </style>
         <style id="view" border="3" border-top="4">
             <background color="window_face" />
@@ -761,8 +761,8 @@
             <text color="tab_active_text" state="focus" />
         </style>
         <style id="tab_text">
-            <text color="tab_normal_text" align="left middle" x="4" y="1" />
-            <text color="tab_active_text" align="left middle" x="4" y="1" state="focus" />
+            <text color="tab_normal_text" align="left middle" x="4" y="2" />
+            <text color="tab_active_text" align="left middle" x="4" y="2" state="focus" />
         </style>
         <style id="tab_bottom">
             <background color="tab_active_face" state="focus" />
@@ -778,14 +778,14 @@
             <background part="tab_icon_bg_clicked" state="selected" />
         </style>
         <style id="tab_close_icon" extends="tab_icon">
-            <icon part="tab_close_icon_normal" align="left middle" x="3" />
-            <icon part="tab_close_icon_active" align="left middle" x="3" state="focus" />
-            <icon part="tab_close_icon_normal" align="left middle" x="3" state="selected" />
+            <icon part="tab_close_icon_normal" align="left middle" x="3" y="1" />
+            <icon part="tab_close_icon_active" align="left middle" x="3" y="1" state="focus" />
+            <icon part="tab_close_icon_normal" align="left middle" x="3" y="1" state="selected" />
         </style>
         <style id="tab_modified_icon" extends="tab_icon">
-            <icon part="tab_modified_icon_normal" align="left middle" x="3" />
-            <icon part="tab_modified_icon_active" align="left middle" x="3" state="focus" />
-            <icon part="tab_modified_icon_normal" align="left middle" x="3" state="selected" />
+            <icon part="tab_modified_icon_normal" align="left middle" x="3" y="1" />
+            <icon part="tab_modified_icon_active" align="left middle" x="3" y="1" state="focus" />
+            <icon part="tab_modified_icon_normal" align="left middle" x="3" y="1" state="selected" />
         </style>
         <style id="tab_home">
             <icon part="tab_home_icon_normal" align="left middle" x="4" y="1" />
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 8388aefed..58ef9710f 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -455,15 +455,19 @@ void Theme::paintLayer(Graphics* g,
             pt.x = rc.x+padding.left();
           else if (layer.align() & RIGHT)
             pt.x = rc.x+rc.w-textSize.w-padding.right();
-          else
+          else {
             pt.x = rc.x+padding.left()+(rc.w-padding.width())/2-textSize.w/2;
+            ADJUST_TO_GUISCALE(pt.x);
+          }
 
           if (layer.align() & TOP)
             pt.y = rc.y+padding.top();
           else if (layer.align() & BOTTOM)
             pt.y = rc.y+rc.h-textSize.h-padding.bottom();
-          else
+          else {
             pt.y = rc.y+padding.top()+(rc.h-padding.height())/2-textSize.h/2;
+            ADJUST_TO_GUISCALE(pt.y);
+          }
 
           pt += layer.offset();
 
@@ -494,15 +498,19 @@ void Theme::paintLayer(Graphics* g,
           pt.x = rc.x+padding.left();
         else if (layer.align() & RIGHT)
           pt.x = rc.x+rc.w-iconSize.w-padding.right();
-        else
+        else {
           pt.x = rc.x+padding.left()+(rc.w-padding.width())/2-iconSize.w/2;
+          ADJUST_TO_GUISCALE(pt.x);
+        }
 
         if (layer.align() & TOP)
           pt.y = rc.y+padding.top();
         else if (layer.align() & BOTTOM)
           pt.y = rc.y+rc.h-iconSize.h-padding.bottom();
-        else
+        else {
           pt.y = rc.y+padding.top()+(rc.h-padding.height())/2-iconSize.h/2;
+          ADJUST_TO_GUISCALE(pt.y);
+        }
 
         pt += layer.offset();
 
diff --git a/src/ui/theme.h b/src/ui/theme.h
index d1260834f..33773a2a8 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -16,6 +16,9 @@
 #include "ui/base.h"
 #include "ui/cursor_type.h"
 #include "ui/style.h"
+#include "ui/scale.h"
+
+#define ADJUST_TO_GUISCALE(v) v -= (v % guiscale());
 
 namespace gfx {
   class Region;
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index e538b2807..a5baa8a91 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -968,15 +968,22 @@ void Widget::getTextIconInfo(
   // Box position
   if (align() & RIGHT)
     box_x = bounds.x2() - box_w - border().right();
-  else if (align() & CENTER)
-    box_x = (bounds.x+bounds.x2())/2 - box_w/2;
+  else if (align() & CENTER) {
+    box_x = (bounds.x + bounds.x2() - box_w) / 2;
+    // Adjust position when it is not a multiple of guiscale. Without these adjustements
+    // it could happen that an icon or text is displayed a in a fraction of a scaled pixel.
+    ADJUST_TO_GUISCALE(box_x);
+  }
   else
     box_x = bounds.x + border().left();
 
   if (align() & BOTTOM)
     box_y = bounds.y2() - box_h - border().bottom();
-  else if (align() & MIDDLE)
-    box_y = (bounds.y+bounds.y2())/2 - box_h/2;
+  else if (align() & MIDDLE) {
+    box_y = (bounds.y + bounds.y2() - box_h) / 2;
+    // Adjust position when it is not a multiple of guiscale
+    ADJUST_TO_GUISCALE(box_y);
+  }
   else
     box_y = bounds.y + border().top();
 
@@ -988,8 +995,11 @@ void Widget::getTextIconInfo(
       icon_x = box_x + box_w - icon_w;
     }
     else if (icon_align & CENTER) {
-      text_x = box_x + box_w/2 - text_w/2;
-      icon_x = box_x + box_w/2 - icon_w/2;
+      text_x = box_x + (box_w - text_w)/2;
+      icon_x = box_x + (box_w - icon_w)/2;
+      // Adjust position when it is not a multiple of guiscale
+      ADJUST_TO_GUISCALE(text_x);
+      ADJUST_TO_GUISCALE(icon_x);
     }
     else {
       text_x = box_x + box_w - text_w;
@@ -1002,8 +1012,11 @@ void Widget::getTextIconInfo(
       icon_y = box_y + box_h - icon_h;
     }
     else if (icon_align & MIDDLE) {
-      text_y = box_y + box_h/2 - text_h/2;
-      icon_y = box_y + box_h/2 - icon_h/2;
+      text_y = box_y + (box_h - text_h)/2;
+      icon_y = box_y + (box_h - icon_h)/2;
+      // Adjust position when it is not a multiple of guiscale
+      ADJUST_TO_GUISCALE(text_y);
+      ADJUST_TO_GUISCALE(icon_y);
     }
     else {
       text_y = box_y + box_h - text_h;

From 5325f56f67aa9d7780cce6e6a8cfe3b240039b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Wed, 7 Dec 2022 15:57:41 -0300
Subject: [PATCH 08/31] Allow overriding the icon part used by icon layers with
 the icon provided by a widget

---
 src/app/ui/button_set.h |  4 +++-
 src/ui/style.h          |  5 +++++
 src/ui/theme.cpp        | 16 +++++++++++++---
 src/ui/theme.h          |  2 ++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/app/ui/button_set.h b/src/app/ui/button_set.h
index 5a15da0aa..baf929654 100644
--- a/src/app/ui/button_set.h
+++ b/src/app/ui/button_set.h
@@ -12,6 +12,7 @@
 #include "app/ui/skin/skin_part.h"
 #include "obs/signal.h"
 #include "ui/grid.h"
+#include "ui/style.h"
 
 #include <string>
 
@@ -19,12 +20,13 @@ namespace app {
 
   class ButtonSet : public ui::Grid {
   public:
-    class Item : public ui::Widget {
+    class Item : public ui::Widget, public ui::Style::Layer::IconSurfaceProvider {
     public:
       Item();
       void setHotColor(gfx::Color color);
       void setIcon(const skin::SkinPartPtr& icon, bool mono = false);
       void setMono(const bool mono) { m_mono = mono; }
+      os::Surface* iconSurface() const override { return m_icon ? m_icon->bitmap(0) : nullptr; }
       skin::SkinPartPtr icon() const { return m_icon; }
       ButtonSet* buttonSet();
     protected:
diff --git a/src/ui/style.h b/src/ui/style.h
index 8f3bbc5e5..0eae8e982 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -51,6 +51,11 @@ namespace ui {
         kCapture = 16
       };
 
+      class IconSurfaceProvider {
+      public:
+        virtual os::Surface* iconSurface() const = 0;
+      };
+
       Layer()
         : m_type(Type::kNone)
         , m_flags(0)
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 58ef9710f..c730e737b 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -104,6 +104,7 @@ PaintWidgetPartInfo::PaintWidgetPartInfo()
   styleFlags = 0;
   text = nullptr;
   mnemonic = 0;
+  icon = nullptr;
 }
 
 PaintWidgetPartInfo::PaintWidgetPartInfo(const Widget* widget)
@@ -114,6 +115,10 @@ PaintWidgetPartInfo::PaintWidgetPartInfo(const Widget* widget)
   styleFlags = PaintWidgetPartInfo::getStyleFlagsForWidget(widget);
   text = &widget->text();
   mnemonic = widget->mnemonic();
+  icon = nullptr;
+  if (const Style::Layer::IconSurfaceProvider* iconProvider = dynamic_cast<const Style::Layer::IconSurfaceProvider*>(widget)) {
+    icon = iconProvider->iconSurface();
+  }
 }
 
 // static
@@ -202,7 +207,7 @@ void Theme::paintWidgetPart(Graphics* g,
     (const Style::Layer& layer) {
       paintLayer(g, style, layer,
                  (info.text ? *info.text: std::string()),
-                 info.mnemonic, rc, outBgColor);
+                 info.mnemonic, info.icon, rc, outBgColor);
     });
 }
 
@@ -319,6 +324,7 @@ void Theme::paintLayer(Graphics* g,
                        const Style::Layer& layer,
                        const std::string& text,
                        const int mnemonic,
+                       os::Surface* providedIcon,
                        gfx::Rect& rc,
                        gfx::Color& bgColor)
 {
@@ -483,7 +489,7 @@ void Theme::paintLayer(Graphics* g,
       break;
 
     case Style::Layer::Type::kIcon: {
-      os::Surface* icon = layer.icon();
+      os::Surface* icon = providedIcon ? providedIcon : layer.icon();
       if (icon) {
         gfx::Size iconSize(icon->width(), icon->height());
         gfx::Point pt;
@@ -599,7 +605,11 @@ void Theme::measureLayer(const Widget* widget,
       break;
 
     case Style::Layer::Type::kIcon: {
-      os::Surface* icon = layer.icon();
+      const os::Surface* icon = layer.icon();
+      if (const Style::Layer::IconSurfaceProvider* iconProvider = dynamic_cast<const Style::Layer::IconSurfaceProvider*>(widget)) {
+        icon = iconProvider->iconSurface() ? iconProvider->iconSurface() : icon;
+      }
+
       if (icon) {
         iconHint.w = std::max(iconHint.w, icon->width()+ABS(layer.offset().x));
         iconHint.h = std::max(iconHint.h, icon->height()+ABS(layer.offset().y));
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 33773a2a8..46074dfbe 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -46,6 +46,7 @@ namespace ui {
     int styleFlags;           // ui::Style::Layer flags
     const std::string* text;
     int mnemonic;
+    os::Surface* icon;
 
     PaintWidgetPartInfo();
     PaintWidgetPartInfo(const Widget* widget);
@@ -148,6 +149,7 @@ namespace ui {
                     const Style::Layer& layer,
                     const std::string& text,
                     const int mnemonic,
+                    os::Surface* icon,
                     gfx::Rect& rc,
                     gfx::Color& bgColor);
     void measureLayer(const Widget* widget,

From 40426075f27e32a16d1baf103b823f2195f85e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 12 Dec 2022 13:54:16 -0300
Subject: [PATCH 09/31] Add gap, gap-rows, and gap-columns style attributes

---
 src/app/ui/skin/skin_theme.cpp | 13 ++++++++++++
 src/ui/grid.cpp                | 38 +++++++++++++++++++++++++++-------
 src/ui/grid.h                  |  7 +++++++
 src/ui/style.cpp               |  1 +
 src/ui/style.h                 |  4 ++++
 src/ui/widget.h                |  2 +-
 6 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index ab452b604..a0b9e15e6 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -648,6 +648,18 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         style->setMinSize(minSize);
         style->setMaxSize(maxSize);
       }
+
+      // Gap
+      {
+        const char* m = xmlStyle->Attribute("gap");
+        const char* r = xmlStyle->Attribute("gap-rows");
+        const char* c = xmlStyle->Attribute("gap-columns");
+        gfx::Size gap = style->gap();
+        if (m || c) gap.w = scale*std::strtol(c ? c: m, nullptr, 10);
+        if (m || r) gap.h = scale*std::strtol(r ? r: m, nullptr, 10);
+        style->setGap(gap);
+      }
+
       // Font
       {
         const char* fontId = xmlStyle->Attribute("font");
@@ -880,6 +892,7 @@ void SkinTheme::initWidget(Widget* widget)
       widget->setStyle(styles.grid());
       BORDER(0);
       widget->setChildSpacing(4 * scale);
+      static_cast<ui::Grid *>(widget)->setGap(styles.grid()->gap());
       break;
 
     case kLabelWidget:
diff --git a/src/ui/grid.cpp b/src/ui/grid.cpp
index 5f6f1913d..180f2a3b3 100644
--- a/src/ui/grid.cpp
+++ b/src/ui/grid.cpp
@@ -40,6 +40,8 @@ Grid::Cell::Cell()
 
 Grid::Grid(int columns, bool same_width_columns)
   : Widget(kGridWidget)
+  , m_rowgap(0)
+  , m_colgap(0)
   , m_colstrip(columns)
 {
   ASSERT(columns > 0);
@@ -121,6 +123,18 @@ Grid::Info Grid::getChildInfo(Widget* child)
   return info;
 }
 
+void Grid::setStyle(Style* style)
+{
+  Widget::setStyle(style);
+  setGap(style->gap());
+}
+
+void Grid::setGap(const gfx::Size& gap)
+{
+  m_colgap = gap.w;
+  m_rowgap = gap.h;
+}
+
 void Grid::onResize(ResizeEvent& ev)
 {
   gfx::Rect rect = ev.bounds();
@@ -181,15 +195,20 @@ void Grid::onResize(ResizeEvent& ev)
         if (y+h > rect.y+rect.h-border().bottom())
           h = rect.y+rect.h-border().bottom()-y;
 
+        if (m_colgap < 0 && col+cell->hspan-1 < (int)m_colstrip.size()-1)
+          w += m_colgap;
+        if (m_rowgap < 0 && row+cell->vspan-1 < (int)m_rowstrip.size()-1)
+          h += m_rowgap;
+
         cell->child->setBounds(Rect(x, y, w, h));
       }
 
       if (m_colstrip[col].size > 0)
-        pos_x += m_colstrip[col].size + childSpacing();
+        pos_x += m_colstrip[col].size + childSpacing() + m_colgap;
     }
 
     if (m_rowstrip[row].size > 0)
-      pos_y += m_rowstrip[row].size + childSpacing();
+      pos_y += m_rowstrip[row].size + childSpacing() + m_rowgap;
   }
 }
 
@@ -211,13 +230,14 @@ void Grid::onSizeHint(SizeHintEvent& ev)
 void Grid::sumStripSize(const std::vector<Strip>& strip, int& size)
 {
   int i, j;
+  int gap = &strip == &m_colstrip ? m_colgap : m_rowgap;
 
   size = 0;
   for (i=j=0; i<(int)strip.size(); ++i) {
     if (strip[i].size > 0) {
       size += strip[i].size;
       if (++j > 1)
-        size += this->childSpacing();
+        size += this->childSpacing()+gap;
     }
   }
 }
@@ -225,6 +245,7 @@ void Grid::sumStripSize(const std::vector<Strip>& strip, int& size)
 void Grid::calculateCellSize(int start, int span, const std::vector<Strip>& strip, int& size)
 {
   int i, j;
+  int gap = &strip == &m_colstrip ? m_colgap : m_rowgap;
 
   size = 0;
 
@@ -232,7 +253,7 @@ void Grid::calculateCellSize(int start, int span, const std::vector<Strip>& stri
     if (strip[i].size > 0) {
       size += strip[i].size;
       if (++j > 1)
-        size += this->childSpacing();
+        size += this->childSpacing()+gap;
     }
   }
 }
@@ -283,8 +304,8 @@ void Grid::calculateStripSize(std::vector<Strip>& colstrip,
           // If the widget isn't hidden then we can request its size
           if (!(cell->child->hasFlags(HIDDEN))) {
             Size reqSize = cell->child->sizeHint();
-            cell->w = reqSize.w - (cell->hspan-1) * this->childSpacing();
-            cell->h = reqSize.h - (cell->vspan-1) * this->childSpacing();
+            cell->w = reqSize.w - (cell->hspan-1) * (this->childSpacing()+m_colgap);
+            cell->h = reqSize.h - (cell->vspan-1) * (this->childSpacing()+m_rowgap);
 
             if ((cell->align & align) == align)
               ++expand_count;
@@ -397,6 +418,7 @@ void Grid::distributeStripSize(std::vector<Strip>& colstrip,
                                int rect_size, int border_size, bool same_width)
 {
   int i, j;
+  int gap = &colstrip == &m_colstrip ? m_colgap : m_rowgap;
 
   int max_expand_count = 0;
   for (i=0; i<(int)colstrip.size(); ++i)
@@ -409,7 +431,7 @@ void Grid::distributeStripSize(std::vector<Strip>& colstrip,
     if (colstrip[i].size > 0) {
       total_req += colstrip[i].size;
       if (++j > 1)
-        total_req += this->childSpacing();
+        total_req += this->childSpacing()+gap;
     }
 
     if (colstrip[i].expand_count == max_expand_count || same_width) {
@@ -430,7 +452,7 @@ void Grid::distributeStripSize(std::vector<Strip>& colstrip,
     for (i=0; i<(int)colstrip.size(); ++i) {
       if ((colstrip[i].size == 0) &&
           (colstrip[i].expand_count == max_expand_count || same_width)) {
-        extra_total -= SGN(extra_total)*this->childSpacing();
+        extra_total -= SGN(extra_total)*(this->childSpacing()+gap);
       }
     }
 
diff --git a/src/ui/grid.h b/src/ui/grid.h
index 903109694..4ef3967e1 100644
--- a/src/ui/grid.h
+++ b/src/ui/grid.h
@@ -31,12 +31,19 @@ namespace ui {
 
     void addChildInCell(Widget* child, int hspan, int vspan, int align);
     Info getChildInfo(Widget* child);
+    void setGap(const gfx::Size& gap);
+    void setStyle(Style* style) override;
 
   protected:
     // Events
     void onResize(ResizeEvent& ev) override;
     void onSizeHint(SizeHintEvent& ev) override;
 
+    // Separation between rows of grid cells. Negative values will overlap rows.
+    int m_rowgap;
+    // Separation between columns of grid cells. Negative values will overlap columns.
+    int m_colgap;
+
   private:
     struct Cell {
       Cell* parent;
diff --git a/src/ui/style.cpp b/src/ui/style.cpp
index 3e119da81..b51ba15c8 100644
--- a/src/ui/style.cpp
+++ b/src/ui/style.cpp
@@ -40,6 +40,7 @@ Style::Style(const Style* base)
   , m_padding(base ? base->padding(): Style::UndefinedBorder())
   , m_minSize(base ? base->minSize(): Style::MinSize())
   , m_maxSize(base ? base->maxSize(): Style::MaxSize())
+  , m_gap(base ? base->gap(): gfx::Size(0, 0))
   , m_font(nullptr)
   , m_mnemonics(base ? base->mnemonics() : true)
 {
diff --git a/src/ui/style.h b/src/ui/style.h
index 0eae8e982..3e1ba2c54 100644
--- a/src/ui/style.h
+++ b/src/ui/style.h
@@ -114,6 +114,7 @@ namespace ui {
     const gfx::Border& padding() const { return m_padding; }
     const gfx::Size& minSize() const { return m_minSize; }
     const gfx::Size& maxSize() const { return m_maxSize; }
+    const gfx::Size& gap() const { return m_gap; }
     os::Font* font() const { return m_font.get(); }
     const bool mnemonics() const { return m_mnemonics; }
     const Layers& layers() const { return m_layers; }
@@ -125,6 +126,7 @@ namespace ui {
     void setPadding(const gfx::Border& value) { m_padding = value; }
     void setMinSize(const gfx::Size& sz);
     void setMaxSize(const gfx::Size& sz);
+    void setGap(const gfx::Size& value) { m_gap = value; }
     void setFont(const os::FontRef& font);
     void setMnemonics(const bool enabled) { m_mnemonics = enabled; }
     void addLayer(const Layer& layer);
@@ -140,6 +142,8 @@ namespace ui {
     gfx::Size m_minSize;
     // Max width and height for the widget.
     gfx::Size m_maxSize;
+    // Grid's columns and rows separation in pixels.
+    gfx::Size m_gap;
     os::FontRef m_font;
     bool m_mnemonics;
   };
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 775fc4792..c3d6541f0 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -152,7 +152,7 @@ namespace ui {
     Theme* theme() const { return m_theme; }
     Style* style() const { return m_style; }
     void setTheme(Theme* theme);
-    void setStyle(Style* style);
+    virtual void setStyle(Style* style);
     void initTheme();
 
     // ===============================================================

From 3ab993d1d61c9790e3bed90f9d20bef04863532f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Thu, 15 Dec 2022 13:03:23 -0300
Subject: [PATCH 10/31] Update ButtonSet to use theme's styles

---
 data/extensions/aseprite-theme/theme.xml |  26 ++++
 src/app/ui/button_set.cpp                | 187 +++++++----------------
 src/app/ui/button_set.h                  |  16 +-
 3 files changed, 90 insertions(+), 139 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index e52307ee2..08ce5d1bc 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1013,5 +1013,31 @@
             <text color="slider_empty_text" align="center middle" />
             <text color="slider_empty_text" align="center middle" state="focus" />
         </style>
+        <style id="buttonset" gap-rows="-3" gap-columns="-1" />
+        <style id="buttonset_item" font="mini">
+            <background-border part="buttonset_item_normal" />
+            <background-border part="buttonset_item_hot" state="selected" />
+            <background-border part="buttonset_item_hot" state="mouse" />
+            <background-border part="buttonset_item_hot_focused" state="selected focus" />
+            <background-border part="buttonset_item_hot_focused" state="mouse focus" />
+            <background-border part="buttonset_item_pushed" state="capture selected" />
+            <background-border part="buttonset_item_pushed" state="mouse capture" />
+            <background-border part="buttonset_item_focused" state="focus" />
+        </style>
+        <style id="buttonset_item_icon" extends="buttonset_item">
+            <icon />
+            <icon state="disabled" color="disabled" />
+            <icon state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="buttonset_item_text" extends="buttonset_item" padding="1">
+            <text color="button_normal_text" y="1" />
+            <text color="button_hot_text" state="selected" y="1" />
+            <text color="button_hot_text" state="mouse" y="1" />
+            <text color="button_selected_text" state="mouse capture" y="1" />
+            <text color="button_selected_text" state="capture selected" y="1" />
+            <text color="background" x="1" y="2" state="disabled" />
+            <newlayer />
+            <text color="disabled" state="disabled" align="top" y="1" />
+        </style>
     </styles>
 </theme>
diff --git a/src/app/ui/button_set.cpp b/src/app/ui/button_set.cpp
index d72dd2c41..4ca294f40 100644
--- a/src/app/ui/button_set.cpp
+++ b/src/app/ui/button_set.cpp
@@ -48,22 +48,15 @@ WidgetType buttonset_item_type()
 ButtonSet::Item::Item()
   : Widget(buttonset_item_type())
   , m_icon(NULL)
-  , m_hotColor(gfx::ColorNone)
 {
   setup_mini_font(this);
   setAlign(CENTER | MIDDLE);
   setFocusStop(true);
 }
 
-void ButtonSet::Item::setHotColor(gfx::Color color)
-{
-  m_hotColor = color;
-}
-
-void ButtonSet::Item::setIcon(const SkinPartPtr& icon, bool mono)
+void ButtonSet::Item::setIcon(const SkinPartPtr& icon)
 {
   m_icon = icon;
-  m_mono = mono;
   invalidate();
 }
 
@@ -74,97 +67,17 @@ ButtonSet* ButtonSet::Item::buttonSet()
 
 void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
 {
-  auto theme = SkinTheme::get(this);
-  Graphics* g = ev.graphics();
-  gfx::Rect rc = clientBounds();
-  gfx::Color fg;
-  SkinPartPtr nw;
-  gfx::Rect boxRc, textRc, iconRc;
-  gfx::Size iconSize;
-  if (m_icon)
-    iconSize = m_icon->size();
+  if (style()) {
+    gfx::Rect rc = clientBounds();
+    Grid::Info info = buttonSet()->getChildInfo(this);
+    bool isLastCol = (info.col + info.hspan >= info.grid_cols);
+    bool isLastRow = (info.row + info.vspan >= info.grid_rows);
+    // When gaps are negative we need to compensate client bounds size so the painting is based on a
+    // complete button, and not just the part not overlapped.
+    if (buttonSet()->m_colgap < 0 && !isLastCol) rc.w -= buttonSet()->m_colgap;
+    if (buttonSet()->m_rowgap < 0 && !isLastRow) rc.h -= buttonSet()->m_rowgap;
 
-  getTextIconInfo(
-    &boxRc, &textRc, &iconRc,
-    CENTER | (hasText() ? BOTTOM: MIDDLE),
-    iconSize.w, iconSize.h);
-
-  Grid::Info info = buttonSet()->getChildInfo(this);
-  bool isLastCol = (info.col+info.hspan >= info.grid_cols);
-  bool isLastRow = (info.row+info.vspan >= info.grid_rows);
-
-  if (m_icon || isLastRow) {
-    textRc.y -= 2*guiscale();
-    iconRc.y -= 1*guiscale();
-    if (isLastRow && info.row > 0) iconRc.y -= 2*guiscale();
-  }
-
-  if (!gfx::is_transparent(bgColor()))
-    g->fillRect(bgColor(), g->getClipBounds());
-
-  if (isSelected() || hasMouseOver()) {
-    if (hasCapture()) {
-      nw = theme->parts.buttonsetItemPushed();
-      fg = theme->colors.buttonSelectedText();
-    }
-    else {
-      nw = (hasFocus() ? theme->parts.buttonsetItemHotFocused():
-                         theme->parts.buttonsetItemHot());
-      fg = theme->colors.buttonHotText();
-    }
-  }
-  else {
-    nw = (hasFocus() ? theme->parts.buttonsetItemFocused():
-                       theme->parts.buttonsetItemNormal());
-    fg = theme->colors.buttonNormalText();
-  }
-
-  if (!isLastCol)
-    rc.w += 1*guiscale();
-
-  if (!isLastRow) {
-    if (nw == theme->parts.buttonsetItemHotFocused())
-      rc.h += 2*guiscale();
-    else
-      rc.h += 3*guiscale();
-  }
-
-  theme->drawRect(g, rc, nw.get(),
-                  gfx::is_transparent(m_hotColor));
-
-  if (!gfx::is_transparent(m_hotColor)) {
-    gfx::Rect rc2(rc);
-    gfx::Rect sprite(nw->spriteBounds());
-    gfx::Rect slices(nw->slicesBounds());
-    rc2.shrink(
-      gfx::Border(
-        slices.x-1, // TODO this "-1" is an ugly hack for the pal edit
-                    //      button, replace all this with styles
-        slices.y-1,
-        sprite.w-slices.w-slices.x-1,
-        sprite.h-slices.h-slices.y));
-    g->fillRect(m_hotColor, rc2);
-  }
-
-  if (m_icon) {
-    os::Surface* bmp = m_icon->bitmap(0);
-
-    if (!isEnabled())
-      g->drawColoredRgbaSurface(bmp, theme->colors.disabled(),
-                                iconRc.x, iconRc.y);
-    else if (isSelected() && hasCapture())
-      g->drawColoredRgbaSurface(bmp, theme->colors.buttonSelectedText(),
-                                iconRc.x, iconRc.y);
-    else if (m_mono)
-      g->drawColoredRgbaSurface(bmp, theme->colors.buttonNormalText(),
-                                iconRc.x, iconRc.y);
-    else
-      g->drawRgbaSurface(bmp, iconRc.x, iconRc.y);
-  }
-
-  if (hasText()) {
-    g->setFont(AddRef(font()));
-    g->drawUIText(text(), fg, gfx::ColorNone, textRc.origin(), 0);
+    theme()->paintWidget(ev.graphics(), this, style(), rc);
   }
 }
 
@@ -195,6 +108,7 @@ bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
       break;
 
     case ui::kMouseDownMessage:
+      if (!isEnabled()) return true;
       // Only for single-item and trigerred on mouse up ButtonSets: We
       // save the current selected item to restore it just in case the
       // user leaves the ButtonSet without releasing the mouse button
@@ -259,38 +173,13 @@ bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
 
     case ui::kMouseLeaveMessage:
     case ui::kMouseEnterMessage:
+      if (!isEnabled()) return true;
       invalidate();
       break;
   }
   return Widget::onProcessMessage(msg);
 }
 
-void ButtonSet::Item::onSizeHint(ui::SizeHintEvent& ev)
-{
-  gfx::Size iconSize;
-  if (m_icon) {
-    iconSize = m_icon->size();
-    iconSize.w = std::max(iconSize.w, 16*guiscale());
-    iconSize.h = std::max(iconSize.h, 16*guiscale());
-  }
-
-  gfx::Rect boxRc;
-  getTextIconInfo(
-    &boxRc, NULL, NULL,
-    CENTER | (hasText() ? BOTTOM: MIDDLE),
-    iconSize.w, iconSize.h);
-
-  gfx::Size sz = boxRc.size();
-  if (hasText())
-    sz += 8*guiscale();
-
-  Grid::Info info = buttonSet()->getChildInfo(this);
-  if (info.row == info.grid_rows-1)
-    sz.h += 3*guiscale();
-
-  ev.setSizeHint(sz);
-}
-
 void ButtonSet::Item::onClick()
 {
   buttonSet()->onItemChange(this);
@@ -310,28 +199,66 @@ ButtonSet::ButtonSet(int columns)
   InitTheme.connect(
     [this]{
       noBorderNoChildSpacing();
+      // Set default buttonset style if it wasn't already set.
+      if (style() == SkinTheme::instance()->styles.grid()) {
+        setStyle(SkinTheme::instance()->styles.buttonset());
+      }
     });
   initTheme();
 }
 
-ButtonSet::Item* ButtonSet::addItem(const std::string& text, int hspan, int vspan)
+ButtonSet::Item* ButtonSet::addItem(const std::string& text, const char* styleId)
+{
+  return addItem(text, 1, 1, styleId);
+}
+
+ButtonSet::Item* ButtonSet::addItem(const std::string& text, int hspan, int vspan, const char* styleId)
 {
   Item* item = new Item();
   item->setText(text);
-  addItem(item, hspan, vspan);
+  addItem(item, hspan, vspan, styleId);
   return item;
 }
 
-ButtonSet::Item* ButtonSet::addItem(const skin::SkinPartPtr& icon, int hspan, int vspan)
+ButtonSet::Item* ButtonSet::addItem(const skin::SkinPartPtr& icon, const char* styleId)
+{
+  return addItem(icon, 1, 1, styleId);
+}
+
+ButtonSet::Item* ButtonSet::addItem(const skin::SkinPartPtr& icon, int hspan, int vspan, const char* styleId)
 {
   Item* item = new Item();
   item->setIcon(icon);
-  addItem(item, hspan, vspan);
+  addItem(item, hspan, vspan, styleId);
   return item;
 }
-
-ButtonSet::Item* ButtonSet::addItem(Item* item, int hspan, int vspan)
+ButtonSet::Item* ButtonSet::addItem(Item* item, const char* styleId)
 {
+  return addItem(item, 1, 1, styleId);
+}
+
+ButtonSet::Item* ButtonSet::addItem(Item* item, int hspan, int vspan, const char* styleId)
+{
+  item->InitTheme.connect(
+    [item, styleId] {
+      ui::Style* style;
+      if (styleId) {
+        auto theme = SkinTheme::get(item);
+        style = theme->getStyleById(styleId);
+        if (!style)
+          throw base::Exception("Style %s not found", styleId);
+      }
+      else {
+        style = SkinTheme::instance()->styles.buttonsetItemIcon();
+        if (!item->text().empty()) {
+          style = item->icon() ? SkinTheme::instance()->styles.buttonsetItemTextTopIconBottom() :
+                                SkinTheme::instance()->styles.buttonsetItemText();
+        }
+      }
+
+      item->setStyle(style);
+    }
+  );
   addChildInCell(item, hspan, vspan, HORIZONTAL | VERTICAL);
   return item;
 }
diff --git a/src/app/ui/button_set.h b/src/app/ui/button_set.h
index baf929654..98f3786ed 100644
--- a/src/app/ui/button_set.h
+++ b/src/app/ui/button_set.h
@@ -23,22 +23,17 @@ namespace app {
     class Item : public ui::Widget, public ui::Style::Layer::IconSurfaceProvider {
     public:
       Item();
-      void setHotColor(gfx::Color color);
-      void setIcon(const skin::SkinPartPtr& icon, bool mono = false);
-      void setMono(const bool mono) { m_mono = mono; }
+      void setIcon(const skin::SkinPartPtr& icon);
       os::Surface* iconSurface() const override { return m_icon ? m_icon->bitmap(0) : nullptr; }
       skin::SkinPartPtr icon() const { return m_icon; }
       ButtonSet* buttonSet();
     protected:
       void onPaint(ui::PaintEvent& ev) override;
       bool onProcessMessage(ui::Message* msg) override;
-      void onSizeHint(ui::SizeHintEvent& ev) override;
       virtual void onClick();
       virtual void onRightClick();
     private:
       skin::SkinPartPtr m_icon;
-      bool m_mono;
-      gfx::Color m_hotColor;
     };
 
     enum class MultiMode {
@@ -49,9 +44,12 @@ namespace app {
 
     ButtonSet(int columns);
 
-    Item* addItem(const std::string& text, int hspan = 1, int vspan = 1);
-    Item* addItem(const skin::SkinPartPtr& icon, int hspan = 1, int vspan = 1);
-    Item* addItem(Item* item, int hspan = 1, int vspan = 1);
+    Item* addItem(const std::string& text, const char* styleId);
+    Item* addItem(const std::string& text, int hspan = 1, int vspan = 1, const char* styleId = nullptr);
+    Item* addItem(const skin::SkinPartPtr& icon, const char* styleId);
+    Item* addItem(const skin::SkinPartPtr& icon, int hspan = 1, int vspan = 1, const char* styleId = nullptr);
+    Item* addItem(Item* item, const char* styleId);
+    Item* addItem(Item* item, int hspan = 1, int vspan = 1, const char* styleId = nullptr);
     Item* getItem(int index);
     int getItemIndex(const Item* item) const;
 

From cc3c421391a56ed78f129cc58c796f934e445a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Thu, 15 Dec 2022 16:06:19 -0300
Subject: [PATCH 11/31] Initialize theme for HueSaturationWindow

---
 src/app/commands/filters/cmd_hue_saturation.cpp | 1 +
 src/app/ui/color_sliders.cpp                    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/commands/filters/cmd_hue_saturation.cpp b/src/app/commands/filters/cmd_hue_saturation.cpp
index d2c740dd9..c90059ba4 100644
--- a/src/app/commands/filters/cmd_hue_saturation.cpp
+++ b/src/app/commands/filters/cmd_hue_saturation.cpp
@@ -80,6 +80,7 @@ public:
     m_sliders.setMode(ColorSliders::Mode::Relative);
     m_sliders.ColorChange.connect([this]{ onChangeControls(); });
 
+    initTheme();
     onChangeMode();
   }
 
diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp
index 7bec9ac41..48c779bc9 100644
--- a/src/app/ui/color_sliders.cpp
+++ b/src/app/ui/color_sliders.cpp
@@ -241,7 +241,6 @@ ColorSliders::ColorSliders()
   , m_color(app::Color::fromMask())
 {
   addChild(&m_grid);
-  m_grid.setChildSpacing(0);
 
   // Same order as in Channel enum
   static_assert(Channel::Red == (Channel)0, "");
@@ -258,6 +257,12 @@ ColorSliders::ColorSliders()
   addSlider(Channel::Gray,          "V", 0, 255, -100, 100);
   addSlider(Channel::Alpha,         "A", 0, 255, -100, 100);
 
+  InitTheme.connect(
+    [this] {
+      m_grid.setChildSpacing(0);
+    }
+  );
+
   m_appConn = App::instance()
     ->ColorSpaceChange.connect([this]{ invalidate(); });
 }

From ea43c5f6c81001efdf19390561f3affa72780fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Fri, 16 Dec 2022 17:59:08 -0300
Subject: [PATCH 12/31] Adjust styles to make them work with the new buttonset

---
 data/extensions/aseprite-theme/sheet.png      | Bin 15973 -> 15980 bytes
 data/extensions/aseprite-theme/theme.xml      |  97 ++++++++++++++----
 data/widgets/canvas_size.xml                  |  18 ++--
 data/widgets/debugger.xml                     |   8 +-
 data/widgets/dynamics.xml                     |  12 +--
 data/widgets/keyboard_shortcuts.xml           |   8 ++
 data/widgets/new_sprite.xml                   |  12 +--
 data/widgets/outline.xml                      |  18 ++--
 src/app/commands/cmd_canvas_size.cpp          |   1 -
 src/app/commands/cmd_new_file.cpp             |   1 -
 .../filters/filter_target_buttons.cpp         |   1 +
 src/app/ui/brush_popup.cpp                    |  12 +--
 src/app/ui/color_bar.cpp                      |  45 +++++---
 src/app/ui/context_bar.cpp                    |  53 +++++-----
 src/app/ui/selection_mode_field.cpp           |   8 +-
 15 files changed, 187 insertions(+), 107 deletions(-)

diff --git a/data/extensions/aseprite-theme/sheet.png b/data/extensions/aseprite-theme/sheet.png
index 0f85aeb4c83f76e781b65001715b6dced69deba9..b16b901ff92e0adf5a5b0c90df7fa20c9c82f54a 100644
GIT binary patch
delta 15108
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
CrP0a&

delta 15101
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

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 08ce5d1bc..9dad65d66 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -27,7 +27,7 @@
         <dim id="timeline_base_size" value="12" />
         <dim id="color_bar_buttons_height" value="16" />
         <dim id="context_bar_height" value="18" />
-        <dim id="brush_type_width" value="16" />
+        <dim id="brush_type_width" value="15" />
         <dim id="color_selector_bar_size" value="8" />
     </dimensions>
     <colors>
@@ -203,11 +203,11 @@
         <part id="toolbutton_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
+        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
@@ -421,10 +421,10 @@
         <part id="folder_icon_small" x="144" y="272" w="10" h="8" />
         <part id="folder_icon_big" x="176" y="272" w="32" h="32" />
         <part id="folder_icon_medium" x="160" y="272" w="16" h="16" />
-        <part id="outline_circle" x="144" y="224" w="13" h="15" />
-        <part id="outline_square" x="160" y="224" w="13" h="15" />
-        <part id="outline_horizontal" x="176" y="224" w="13" h="15" />
-        <part id="outline_vertical" x="192" y="224" w="13" h="15" />
+        <part id="outline_circle" x="144" y="226" w="13" h="13" />
+        <part id="outline_square" x="160" y="226" w="13" h="13" />
+        <part id="outline_horizontal" x="176" y="226" w="13" h="13" />
+        <part id="outline_vertical" x="192" y="226" w="13" h="13" />
         <part id="outline_empty_pixel" x="208" y="224" w="5" h="5" />
         <part id="outline_full_pixel" x="214" y="224" w="5" h="5" />
         <part id="dynamics" x="176" y="144" w="16" h="16" />
@@ -608,7 +608,7 @@
             <icon part="radio_selected" align="left middle" x="2" state="selected" />
             <icon part="radio_disabled" align="left middle" x="2" state="disabled" />
         </style>
-        <style id="mini_button">
+        <style id="mini_button" padding-top="1">
             <background-border part="buttonset_item_normal" />
             <background-border part="buttonset_item_hot" state="mouse" />
             <background-border part="buttonset_item_hot" state="focus" />
@@ -618,10 +618,10 @@
             <text color="button_selected_text" state="selected" />
         </style>
         <style id="mini_check_box" extends="check_box" font="mini" />
-        <style id="combobox_button" extends="mini_button">
-            <icon part="combobox_arrow_down" />
-            <icon part="combobox_arrow_down_selected" state="selected" />
-            <icon part="combobox_arrow_down_disabled" state="disabled" />
+        <style id="combobox_button" extends="mini_button" padding="0">
+            <icon part="combobox_arrow_down" y="1" />
+            <icon part="combobox_arrow_down_selected" state="selected" y="1" />
+            <icon part="combobox_arrow_down_disabled" state="disabled" y="1" />
         </style>
         <style id="drop_down_button" extends="button">
             <background-border part="drop_down_button_left_normal" />
@@ -638,17 +638,17 @@
             <icon part="combobox_arrow_down_selected" state="selected" />
             <icon part="combobox_arrow_down_disabled" state="disabled" />
         </style>
-        <style id="go_back_button" extends="mini_button">
+        <style id="go_back_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_left" />
             <icon part="combobox_arrow_left_selected" state="selected" />
             <icon part="combobox_arrow_left_disabled" state="disabled" />
         </style>
-        <style id="go_forward_button" extends="mini_button">
+        <style id="go_forward_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_right" />
             <icon part="combobox_arrow_right_selected" state="selected" />
             <icon part="combobox_arrow_right_disabled" state="disabled" />
         </style>
-        <style id="go_up_button" extends="mini_button">
+        <style id="go_up_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_up" />
             <icon part="combobox_arrow_up_selected" state="selected" />
             <icon part="combobox_arrow_up_disabled" state="disabled" />
@@ -657,7 +657,7 @@
             <icon part="arrow_circle_cw" />
             <icon part="arrow_circle_cw_selected" state="selected" />
         </style>
-        <style id="new_folder_button" extends="mini_button">
+        <style id="new_folder_button" extends="mini_button" padding-top="2">
             <icon part="newfolder" />
             <icon part="newfolder_selected" state="selected" />
         </style>
@@ -752,7 +752,7 @@
             <background color="workspace" />
         </style>
         <style id="workspace_check_box" extends="check_box" padding="4">
-          <text color="workspace_text" align="left middle" x="14" />
+            <text color="workspace_text" align="left middle" x="14" />
         </style>
         <style id="tab">
             <background part="tab_normal" align="middle" />
@@ -1039,5 +1039,62 @@
             <newlayer />
             <text color="disabled" state="disabled" align="top" y="1" />
         </style>
+        <style id="buttonset_item_text_top" extends="buttonset_item">
+            <text color="button_normal_text" align="top" />
+            <text color="button_hot_text" state="selected" align="top" />
+            <text color="button_hot_text" state="mouse" align="top" />
+            <text color="button_selected_text" state="mouse capture" align="top" />
+            <text color="button_selected_text" state="capture selected" align="top" />
+            <text color="background" x="1" y="1" state="disabled" align="top" />
+            <newlayer />
+            <text color="disabled" state="disabled" align="top" />
+        </style>
+        <style id="buttonset_item_text_top_icon_bottom" extends="buttonset_item_text_top" padding-top="2" padding-bottom="1">
+            <icon align="bottom" />
+            <icon align="bottom" state="disabled" color="disabled" />
+            <icon align="bottom" state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="new_sprite_rgb" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="new_sprite_grayscale" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="new_sprite_indexed" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_transparent" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_white" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_black" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="dir_item" extends="buttonset_item_icon" width="18" height="20" />
+        <style id="context_bar_button" extends="buttonset_item_icon" width="15" />
+        <style id="context_bar_text_button" extends="buttonset_item_text" width="15" />
+        <style id="brush_type" extends="context_bar_button" padding-top="1" />
+        <style id="brush_type_mono" extends="context_bar_button" padding-top="1">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="pivot_field" extends="context_bar_button" padding-top="1" />
+        <style id="pivot_dir" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="selection_mode" extends="context_bar_button" padding-top="1" />
+        <style id="symmetry_field" extends="context_bar_button" padding-top="1" />
+        <style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" />
+        <style id="pal_edit_button" extends="buttonset_item_icon" width="15" />
+        <style id="pal_edit_button_hot" extends="buttonset_item" width="15">
+            <background color="edit_pal_face" />
+            <icon />
+            <icon state="disabled" color="disabled" />
+            <icon state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" />
+        <style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="tiles_button" extends="buttonset_item_icon" width="15">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="tiles_button_hot" extends="buttonset_item" width="15">
+            <background color="edit_pal_face" />
+            <newlayer />
+            <icon color="button_normal_text" />
+            <icon state="disabled" color="disabled" />
+            <icon state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
+        <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />
     </styles>
 </theme>
diff --git a/data/widgets/canvas_size.xml b/data/widgets/canvas_size.xml
index 725d12ea7..0e9b4bdee 100644
--- a/data/widgets/canvas_size.xml
+++ b/data/widgets/canvas_size.xml
@@ -14,15 +14,15 @@
         <hbox filler="true" cell_hspan="2" />
       </grid>
       <buttonset columns="3" id="dir">
-        <item icon="canvas_nw" />
-        <item icon="canvas_n" />
-        <item icon="canvas_ne" />
-        <item icon="canvas_w" />
-        <item icon="canvas_c" />
-        <item icon="canvas_e" />
-        <item icon="canvas_sw" />
-        <item icon="canvas_s" />
-        <item icon="canvas_se" />
+        <item icon="canvas_nw" style="dir_item" />
+        <item icon="canvas_n" style="dir_item" />
+        <item icon="canvas_ne" style="dir_item" />
+        <item icon="canvas_w" style="dir_item" />
+        <item icon="canvas_c" style="dir_item" />
+        <item icon="canvas_e" style="dir_item" />
+        <item icon="canvas_sw" style="dir_item" />
+        <item icon="canvas_s" style="dir_item" />
+        <item icon="canvas_se" style="dir_item" />
       </buttonset>
     </hbox>
 
diff --git a/data/widgets/debugger.xml b/data/widgets/debugger.xml
index d365d3dfb..fed38cd41 100644
--- a/data/widgets/debugger.xml
+++ b/data/widgets/debugger.xml
@@ -5,10 +5,10 @@
   <vbox childspacing="0">
     <hbox>
       <buttonset columns="4" id="control">
-        <item icon="debug_continue" tooltip="@.continue" tooltip_dir="bottom" />
-        <item icon="debug_step_into" tooltip="@.step_into" tooltip_dir="bottom" />
-        <item icon="debug_step_over" tooltip="@.step_over" tooltip_dir="bottom" />
-        <item icon="debug_step_out" tooltip="@.step_out" tooltip_dir="bottom" />
+        <item icon="debug_continue" style="debugger_button" tooltip="@.continue" tooltip_dir="bottom" />
+        <item icon="debug_step_into" style="debugger_button" tooltip="@.step_into" tooltip_dir="bottom" />
+        <item icon="debug_step_over" style="debugger_button" tooltip="@.step_over" tooltip_dir="bottom" />
+        <item icon="debug_step_out" style="debugger_button" tooltip="@.step_out" tooltip_dir="bottom" />
       </buttonset>
       <buttonset columns="1" id="breakpoint">
         <item icon="debug_breakpoint" tooltip="@.toggle_breakpoint" tooltip_dir="bottom" />
diff --git a/data/widgets/dynamics.xml b/data/widgets/dynamics.xml
index 0542a340c..8afc83c76 100644
--- a/data/widgets/dynamics.xml
+++ b/data/widgets/dynamics.xml
@@ -16,16 +16,16 @@
       <item text="@.velocity" tooltip="@.velocity_tooltip" tooltip_dir="bottom" />
 
       <item text="@.size" tooltip="@.size_tooltip" tooltip_dir="right" />
-      <item text="" minheight="1" maxheight="1" />
-      <item text="" minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
 
       <item text="@.angle" tooltip="@.angle_tooltip" tooltip_dir="right" />
-      <item text="" minheight="1" maxheight="1" />
-      <item text="" minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
 
       <item text="@.gradient" tooltip="@.gradient_tooltip" tooltip_dir="right" />
-      <item text="" minheight="1" maxheight="1" />
-      <item text="" minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
+      <item minheight="1" maxheight="1" />
     </buttonset>
     </hbox>
 
diff --git a/data/widgets/keyboard_shortcuts.xml b/data/widgets/keyboard_shortcuts.xml
index a721696a5..bb4975909 100644
--- a/data/widgets/keyboard_shortcuts.xml
+++ b/data/widgets/keyboard_shortcuts.xml
@@ -67,28 +67,36 @@
               </vbox>
               <buttonset columns="3" id="drag_angle">
                 <item icon="canvas_nw"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="bottom" />
                 <item icon="canvas_n"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="bottom" />
                 <item icon="canvas_ne"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="bottom" />
                 <item icon="canvas_w"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="right" />
                 <item />
                 <item icon="canvas_e"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="left" />
                 <item icon="canvas_sw"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="top" />
                 <item icon="canvas_s"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="top" />
                 <item icon="canvas_se"
+                      style="dir_item"
                       tooltip="@.drag_angle_tooltip"
                       tooltip_dir="top" />
               </buttonset>
diff --git a/data/widgets/new_sprite.xml b/data/widgets/new_sprite.xml
index 2041ef933..dba6e9421 100644
--- a/data/widgets/new_sprite.xml
+++ b/data/widgets/new_sprite.xml
@@ -15,16 +15,16 @@
 
       <separator text="@.color_mode" left="true" horizontal="true" />
       <buttonset columns="3" id="color_mode">
-        <item text="@.rgba" icon="icon_rgb" tooltip="@.rgba_tooltip" tooltip_dir="bottom" />
-        <item text="@.grayscale" icon="icon_grayscale" tooltip="@.grayscale_tooltip" tooltip_dir="bottom" />
-        <item text="@.indexed" icon="icon_indexed" tooltip="@.indexed_tooltip" tooltip_dir="bottom" />
+        <item text="@.rgba" icon="icon_rgb" style="new_sprite_rgb" tooltip="@.rgba_tooltip" tooltip_dir="bottom" />
+        <item text="@.grayscale" icon="icon_grayscale" style="new_sprite_grayscale" tooltip="@.grayscale_tooltip" tooltip_dir="bottom" />
+        <item text="@.indexed" icon="icon_indexed" style="new_sprite_indexed" tooltip="@.indexed_tooltip" tooltip_dir="bottom" />
       </buttonset>
 
       <separator text="@.background" left="true" horizontal="true" />
       <buttonset columns="3" id="bg_color">
-        <item text="@.transparent" icon="icon_transparent" />
-        <item text="@.white" icon="icon_white" />
-        <item text="@.black" icon="icon_black" />
+        <item text="@.transparent" icon="icon_transparent" style="bg_transparent" />
+        <item text="@.white" icon="icon_white" style="bg_white" />
+        <item text="@.black" icon="icon_black" style="bg_black" />
       </buttonset>
 
       <check id="advanced_check" text="@general.advanced_options" />
diff --git a/data/widgets/outline.xml b/data/widgets/outline.xml
index c7122501b..49891b9ba 100644
--- a/data/widgets/outline.xml
+++ b/data/widgets/outline.xml
@@ -20,15 +20,15 @@
 	</hbox>
 	<hbox>
 	  <buttonset id="outline_matrix" columns="3">
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
-            <item icon="outline_empty_pixel" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
+            <item icon="outline_empty_pixel" style="outline_cell" />
 	  </buttonset>
 	</hbox>
       </vbox>
diff --git a/src/app/commands/cmd_canvas_size.cpp b/src/app/commands/cmd_canvas_size.cpp
index 5eef6b793..50a31ce7a 100644
--- a/src/app/commands/cmd_canvas_size.cpp
+++ b/src/app/commands/cmd_canvas_size.cpp
@@ -15,7 +15,6 @@
 #include "app/doc_api.h"
 #include "app/modules/gui.h"
 #include "app/tx.h"
-#include "app/ui/button_set.h"
 #include "app/ui/color_bar.h"
 #include "app/ui/doc_view.h"
 #include "app/ui/editor/editor.h"
diff --git a/src/app/commands/cmd_new_file.cpp b/src/app/commands/cmd_new_file.cpp
index 9fdd2e26d..02b7fa269 100644
--- a/src/app/commands/cmd_new_file.cpp
+++ b/src/app/commands/cmd_new_file.cpp
@@ -20,7 +20,6 @@
 #include "app/i18n/strings.h"
 #include "app/modules/palettes.h"
 #include "app/pref/preferences.h"
-#include "app/ui/button_set.h"
 #include "app/ui/workspace.h"
 #include "app/ui_context.h"
 #include "app/util/clipboard.h"
diff --git a/src/app/commands/filters/filter_target_buttons.cpp b/src/app/commands/filters/filter_target_buttons.cpp
index 0e36b1e01..d30475a7d 100644
--- a/src/app/commands/filters/filter_target_buttons.cpp
+++ b/src/app/commands/filters/filter_target_buttons.cpp
@@ -68,6 +68,7 @@ FilterTargetButtons::FilterTargetButtons(int imgtype, bool withChannels)
   // Create the button to select which cels will be modified by the
   // filter.
   m_cels = addItem(getCelsTargetText(), 4, 1);
+  initTheme();
 }
 
 void FilterTargetButtons::setTarget(const int target)
diff --git a/src/app/ui/brush_popup.cpp b/src/app/ui/brush_popup.cpp
index f24318f3c..0e4d46e41 100644
--- a/src/app/ui/brush_popup.cpp
+++ b/src/app/ui/brush_popup.cpp
@@ -154,7 +154,7 @@ public:
     , m_brushes(App::instance()->brushes())
     , m_slot(slot) {
     auto theme = skin::SkinTheme::get(this);
-    setIcon(theme->parts.iconArrowDown(), true);
+    setIcon(theme->parts.iconArrowDown());
   }
 
 private:
@@ -283,7 +283,7 @@ class NewBrushOptionsItem : public ButtonSet::Item {
 public:
   NewBrushOptionsItem() {
     auto theme = skin::SkinTheme::get(this);
-    setIcon(theme->parts.iconArrowDown(), true);
+    setIcon(theme->parts.iconArrowDown());
   }
 
 private:
@@ -362,8 +362,7 @@ BrushPopup::BrushPopup()
   for (const auto& brush : brushes.getStandardBrushes()) {
     m_standardBrushes.addItem(
       new SelectBrushItem(
-        BrushSlot(BrushSlot::Flags::BrushType, brush)))
-      ->setMono(true);
+        BrushSlot(BrushSlot::Flags::BrushType, brush)), "standard_brush");
   }
   m_standardBrushes.setTransparent(true);
 
@@ -428,12 +427,13 @@ void BrushPopup::regenerate(ui::Display* display,
     }
     m_customBrushes->addItem(new SelectBrushItem(brush, slot));
     m_customBrushes->addItem(new BrushShortcutItem(shortcut, slot));
-    m_customBrushes->addItem(new BrushOptionsItem(this, slot));
+    m_customBrushes->addItem(new BrushOptionsItem(this, slot), "buttonset_item_icon_mono");
   }
 
   m_customBrushes->addItem(new NewCustomBrushItem, 2, 1);
-  m_customBrushes->addItem(new NewBrushOptionsItem);
+  m_customBrushes->addItem(new NewBrushOptionsItem, "buttonset_item_icon_mono");
   m_customBrushes->setExpansive(true);
+  m_customBrushes->initTheme();
   m_box.addChild(m_customBrushes);
 
   // Resize the window and change the hot region.
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index 3f42b1747..a47559943 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -186,19 +186,35 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
 
   auto theme = SkinTheme::get(this);
 
-  m_editPal.addItem(theme->parts.timelineOpenPadlockActive());
-  m_buttons.addItem(theme->parts.palSort());
-  m_buttons.addItem(theme->parts.palPresets());
-  m_buttons.addItem(theme->parts.palOptions());
-  m_tilesButton.addItem(theme->parts.tiles());
+  auto item = m_editPal.addItem(theme->parts.timelineOpenPadlockActive());
+  item->InitTheme.connect(
+    [this, item](){
+      auto style = m_editMode ? SkinTheme::instance()->styles.palEditButton() :
+                                SkinTheme::instance()->styles.palEditButtonHot();
+      item->setStyle(style);
+  });
+  m_buttons.addItem(theme->parts.palSort(), "pal_button");
+  m_buttons.addItem(theme->parts.palPresets(), "pal_button");
+  m_buttons.addItem(theme->parts.palOptions(), "pal_button");
+  item = m_tilesButton.addItem(theme->parts.tiles());
+  item->InitTheme.connect(
+    [this, item]() {
+
+      const bool canEditTiles = this->canEditTiles();
+      const bool editTiles = (canEditTiles &&
+                              m_tilemapMode == TilemapMode::Tiles);
+      auto style = editTiles ? SkinTheme::instance()->styles.tilesButtonHot() :
+                               SkinTheme::instance()->styles.tilesButton();
+      item->setStyle(style);
+    });
 
   static_assert(0 == int(TilesetMode::Manual) &&
                 1 == int(TilesetMode::Auto) &&
                 2 == int(TilesetMode::Stack), "Tileset mode buttons doesn't match TilesetMode enum values");
 
-  m_tilesetModeButtons.addItem(theme->parts.tilesManual());
-  m_tilesetModeButtons.addItem(theme->parts.tilesAuto());
-  m_tilesetModeButtons.addItem(theme->parts.tilesStack());
+  m_tilesetModeButtons.addItem(theme->parts.tilesManual(), "pal_button");
+  m_tilesetModeButtons.addItem(theme->parts.tilesAuto(), "pal_button");
+  m_tilesetModeButtons.addItem(theme->parts.tilesStack(), "pal_button");
   setTilesetMode(m_tilesetMode);
 
   m_paletteView.setColumns(8);
@@ -520,9 +536,9 @@ void ColorBar::setEditMode(bool state)
   ButtonSet::Item* item = m_editPal.getItem(0);
 
   m_editMode = state;
-  item->setIcon(state ? theme->parts.timelineOpenPadlockActive():
-                        theme->parts.timelineClosedPadlockNormal());
-  item->setHotColor(state ? theme->colors.editPalFace(): gfx::ColorNone);
+  item->setIcon(state ? theme->parts.timelineClosedPadlockNormal():
+                        theme->parts.timelineOpenPadlockActive());
+  item->initTheme();
 
   // Deselect color entries when we cancel editing
   if (!state)
@@ -553,16 +569,11 @@ void ColorBar::setTilemapMode(TilemapMode mode)
 
 void ColorBar::updateFromTilemapMode()
 {
-  SkinTheme* theme = static_cast<SkinTheme*>(this->theme());
   ButtonSet::Item* item = m_tilesButton.getItem(0);
-
   const bool canEditTiles = this->canEditTiles();
   const bool editTiles = (canEditTiles &&
                           m_tilemapMode == TilemapMode::Tiles);
-
-  item->setHotColor(editTiles ? theme->colors.editPalFace():
-                                gfx::ColorNone);
-  item->setMono(true);
+  item->initTheme();
 
   if (Preferences::instance().colorBar.showColorAndTiles()) {
     m_scrollablePalView.setVisible(true);
diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index d0b3e6100..5706b8f51 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -162,7 +162,7 @@ public:
     , m_brushes(App::instance()->brushes()) {
     SkinPartPtr part(new SkinPart);
     part->setBitmap(0, BrushPopup::createSurfaceForBrush(BrushRef(nullptr)));
-    addItem(part);
+    addItem(part, "brush_type");
 
     m_popupWindow.Open.connect(
       [this]{
@@ -182,7 +182,11 @@ public:
     part->setBitmap(0, BrushPopup::createSurfaceForBrush(brush));
 
     const bool mono = (brush->type() != kImageBrushType);
-    getItem(0)->setIcon(part, mono);
+    getItem(0)->setIcon(part);
+    auto style = mono ? SkinTheme::instance()->styles.brushTypeMono() :
+                        SkinTheme::instance()->styles.brushType();
+    getItem(0)->setStyle(style);
+
   }
 
   void switchPopup() {
@@ -380,7 +384,7 @@ class ContextBar::PaintBucketSettingsField : public ButtonSet {
 public:
   PaintBucketSettingsField() : ButtonSet(1) {
     auto theme = SkinTheme::get(this);
-    addItem(theme->parts.timelineGear());
+    addItem(theme->parts.timelineGear(), "context_bar_button");
   }
 
 protected:
@@ -466,7 +470,7 @@ public:
   InkTypeField(ContextBar* owner) : ButtonSet(1)
                                   , m_owner(owner) {
     auto theme = SkinTheme::get(this);
-    addItem(theme->parts.inkSimple());
+    addItem(theme->parts.inkSimple(), "context_bar_button");
   }
 
   void setInkType(InkType inkType) {
@@ -863,7 +867,7 @@ class ContextBar::PivotField : public ButtonSet {
 public:
   PivotField()
     : ButtonSet(1) {
-    addItem(SkinTheme::get(this)->parts.pivotCenter());
+    addItem(SkinTheme::get(this)->parts.pivotCenter(), "pivot_field");
 
     m_pivotConn = Preferences::instance().selection.pivotPosition.AfterChange.connect(
       [this]{ onPivotChange(); });
@@ -883,15 +887,15 @@ private:
     CheckBox visible(Strings::context_bar_default_display_pivot());
     HBox box;
     ButtonSet buttonset(3);
-    buttonset.addItem(theme->parts.pivotNorthwest());
-    buttonset.addItem(theme->parts.pivotNorth());
-    buttonset.addItem(theme->parts.pivotNortheast());
-    buttonset.addItem(theme->parts.pivotWest());
-    buttonset.addItem(theme->parts.pivotCenter());
-    buttonset.addItem(theme->parts.pivotEast());
-    buttonset.addItem(theme->parts.pivotSouthwest());
-    buttonset.addItem(theme->parts.pivotSouth());
-    buttonset.addItem(theme->parts.pivotSoutheast());
+    buttonset.addItem(theme->parts.pivotNorthwest(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotNorth(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotNortheast(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotWest(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotCenter(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotEast(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotSouthwest(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotSouth(), "pivot_dir");
+    buttonset.addItem(theme->parts.pivotSoutheast(), "pivot_dir");
     box.addChild(&buttonset);
 
     menu.addChild(&visible);
@@ -902,6 +906,7 @@ private:
     app::gen::PivotPosition pos = Preferences::instance().selection.pivotPosition();
     visible.setSelected(isVisible);
     buttonset.setSelectedItem(int(pos));
+    buttonset.initTheme();
 
     visible.Click.connect(
       [&visible](){
@@ -1144,7 +1149,7 @@ public:
   DynamicsField(ContextBar* ctxBar)
     : ButtonSet(1)
     , m_ctxBar(ctxBar) {
-    addItem(SkinTheme::get(this)->parts.dynamics());
+    addItem(SkinTheme::get(this)->parts.dynamics(), "context_bar_button");
   }
 
   void switchPopup() {
@@ -1276,8 +1281,8 @@ public:
   GradientTypeField() : ButtonSet(2) {
     auto theme = SkinTheme::get(this);
 
-    addItem(theme->parts.linearGradient());
-    addItem(theme->parts.radialGradient());
+    addItem(theme->parts.linearGradient(), "context_bar_button");
+    addItem(theme->parts.radialGradient(), "context_bar_button");
 
     setSelectedItem(0);
   }
@@ -1299,8 +1304,8 @@ public:
   DropPixelsField() : ButtonSet(2) {
     auto theme = SkinTheme::get(this);
 
-    addItem(theme->parts.dropPixelsOk());
-    addItem(theme->parts.dropPixelsCancel());
+    addItem(theme->parts.dropPixelsOk(), "context_bar_button");
+    addItem(theme->parts.dropPixelsCancel(), "context_bar_button");
     setOfferCapture(false);
   }
 
@@ -1407,9 +1412,9 @@ public:
   SymmetryField() : ButtonSet(3) {
     setMultiMode(MultiMode::Set);
     auto theme = SkinTheme::get(this);
-    addItem(theme->parts.horizontalSymmetry());
-    addItem(theme->parts.verticalSymmetry());
-    addItem("...");
+    addItem(theme->parts.horizontalSymmetry(), "symmetry_field");
+    addItem(theme->parts.verticalSymmetry(), "symmetry_field");
+    addItem("...", "symmetry_options");
   }
 
   void setupTooltips(TooltipManager* tooltipManager) {
@@ -1544,8 +1549,8 @@ public:
     m_combobox.setExpansive(true);
     m_combobox.setMinSize(gfx::Size(256*guiscale(), 0));
 
-    m_action.addItem(theme->parts.iconUserData())->setMono(true);
-    m_action.addItem(theme->parts.iconClose())->setMono(true);
+    m_action.addItem(theme->parts.iconUserData(), "buttonset_item_icon_mono");
+    m_action.addItem(theme->parts.iconClose(), "buttonset_item_icon_mono");
     m_action.ItemChange.connect(
       [this](ButtonSet::Item* item){
         onAction(m_action.selectedItem());
diff --git a/src/app/ui/selection_mode_field.cpp b/src/app/ui/selection_mode_field.cpp
index 8914d7056..bf1f4437c 100644
--- a/src/app/ui/selection_mode_field.cpp
+++ b/src/app/ui/selection_mode_field.cpp
@@ -24,10 +24,10 @@ SelectionModeField::SelectionModeField()
 {
   auto theme = SkinTheme::get(this);
 
-  addItem(theme->parts.selectionReplace());
-  addItem(theme->parts.selectionAdd());
-  addItem(theme->parts.selectionSubtract());
-  addItem(theme->parts.selectionIntersect());
+  addItem(theme->parts.selectionReplace(), "selection_mode");
+  addItem(theme->parts.selectionAdd(), "selection_mode");
+  addItem(theme->parts.selectionSubtract(), "selection_mode");
+  addItem(theme->parts.selectionIntersect(), "selection_mode");
 
   setSelectedItem((int)Preferences::instance().selection.mode());
 }

From 029e520f81ff7b33e71e0530347fba2a32dc268f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Fri, 24 Feb 2023 17:42:22 -0300
Subject: [PATCH 13/31] Add styles for ink type and dynamics buttons

---
 data/extensions/aseprite-theme/theme.xml | 2 ++
 src/app/ui/context_bar.cpp               | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 9dad65d66..cf3f1160a 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1067,6 +1067,8 @@
         <style id="brush_type_mono" extends="context_bar_button" padding-top="1">
             <icon color="button_normal_text" />
         </style>
+        <style id="ink_type" extends="context_bar_button" padding-left="1" />
+        <style id="dynamics_field" extends="context_bar_button" padding-left="1" />
         <style id="pivot_field" extends="context_bar_button" padding-top="1" />
         <style id="pivot_dir" extends="buttonset_item_icon" width="17" height="19" />
         <style id="selection_mode" extends="context_bar_button" padding-top="1" />
diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index 5706b8f51..931f429c4 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -470,7 +470,7 @@ public:
   InkTypeField(ContextBar* owner) : ButtonSet(1)
                                   , m_owner(owner) {
     auto theme = SkinTheme::get(this);
-    addItem(theme->parts.inkSimple(), "context_bar_button");
+    addItem(theme->parts.inkSimple(), "ink_type");
   }
 
   void setInkType(InkType inkType) {
@@ -1149,7 +1149,7 @@ public:
   DynamicsField(ContextBar* ctxBar)
     : ButtonSet(1)
     , m_ctxBar(ctxBar) {
-    addItem(SkinTheme::get(this)->parts.dynamics(), "context_bar_button");
+    addItem(SkinTheme::get(this)->parts.dynamics(), "dynamics_field");
   }
 
   void switchPopup() {

From 0199994e458a40493354704888ca74d43aac210f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Fri, 24 Feb 2023 17:43:54 -0300
Subject: [PATCH 14/31] Remove Y coordinate offset from some elements

---
 data/extensions/aseprite-theme/theme.xml | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index cf3f1160a..f33647987 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -543,9 +543,9 @@
             <background-border part="button_hot" state="mouse" />
             <background-border part="button_selected" state="selected" />
             <icon part="warning_box" align="right" />
-            <text color="button_normal_text" align="left" y="1" />
-            <text color="button_hot_text" align="left" y="1" state="mouse" />
-            <text color="button_selected_text" align="left" y="1" state="selected" />
+            <text color="button_normal_text" align="left" />
+            <text color="button_hot_text" align="left" state="mouse" />
+            <text color="button_selected_text" align="left" state="selected" />
         </style>
         <style id="view" border="3" border-top="4">
             <background color="window_face" />
@@ -761,8 +761,8 @@
             <text color="tab_active_text" state="focus" />
         </style>
         <style id="tab_text">
-            <text color="tab_normal_text" align="left middle" x="4" y="2" />
-            <text color="tab_active_text" align="left middle" x="4" y="2" state="focus" />
+            <text color="tab_normal_text" align="left middle" x="4" y="1" />
+            <text color="tab_active_text" align="left middle" x="4" y="1" state="focus" />
         </style>
         <style id="tab_bottom">
             <background color="tab_active_face" state="focus" />
@@ -778,14 +778,14 @@
             <background part="tab_icon_bg_clicked" state="selected" />
         </style>
         <style id="tab_close_icon" extends="tab_icon">
-            <icon part="tab_close_icon_normal" align="left middle" x="3" y="1" />
-            <icon part="tab_close_icon_active" align="left middle" x="3" y="1" state="focus" />
-            <icon part="tab_close_icon_normal" align="left middle" x="3" y="1" state="selected" />
+            <icon part="tab_close_icon_normal" align="left middle" x="3" />
+            <icon part="tab_close_icon_active" align="left middle" x="3" state="focus" />
+            <icon part="tab_close_icon_normal" align="left middle" x="3" state="selected" />
         </style>
         <style id="tab_modified_icon" extends="tab_icon">
-            <icon part="tab_modified_icon_normal" align="left middle" x="3" y="1" />
-            <icon part="tab_modified_icon_active" align="left middle" x="3" y="1" state="focus" />
-            <icon part="tab_modified_icon_normal" align="left middle" x="3" y="1" state="selected" />
+            <icon part="tab_modified_icon_normal" align="left middle" x="3" />
+            <icon part="tab_modified_icon_active" align="left middle" x="3" state="focus" />
+            <icon part="tab_modified_icon_normal" align="left middle" x="3" state="selected" />
         </style>
         <style id="tab_home">
             <icon part="tab_home_icon_normal" align="left middle" x="4" y="1" />
@@ -1030,14 +1030,14 @@
             <icon state="capture selected" color="button_selected_text" />
         </style>
         <style id="buttonset_item_text" extends="buttonset_item" padding="1">
-            <text color="button_normal_text" y="1" />
-            <text color="button_hot_text" state="selected" y="1" />
-            <text color="button_hot_text" state="mouse" y="1" />
-            <text color="button_selected_text" state="mouse capture" y="1" />
-            <text color="button_selected_text" state="capture selected" y="1" />
-            <text color="background" x="1" y="2" state="disabled" />
+            <text color="button_normal_text" />
+            <text color="button_hot_text" state="selected" />
+            <text color="button_hot_text" state="mouse" />
+            <text color="button_selected_text" state="mouse capture" />
+            <text color="button_selected_text" state="capture selected" />
+            <text color="background" x="1" y="1" state="disabled" />
             <newlayer />
-            <text color="disabled" state="disabled" align="top" y="1" />
+            <text color="disabled" state="disabled" align="top" />
         </style>
         <style id="buttonset_item_text_top" extends="buttonset_item">
             <text color="button_normal_text" align="top" />

From f481d9c0e73fd8c38082a1e631cf339d0694f4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 27 Feb 2023 10:21:50 -0300
Subject: [PATCH 15/31] Fix timeline's animation buttons size

---
 data/extensions/aseprite-theme/theme.xml |  1 +
 src/app/ui/timeline/ani_controls.cpp     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index f33647987..f0e3e7fd7 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1098,5 +1098,6 @@
         </style>
         <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
         <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="ani_button" extends="buttonset_item_icon" width="17" />
     </styles>
 </theme>
diff --git a/src/app/ui/timeline/ani_controls.cpp b/src/app/ui/timeline/ani_controls.cpp
index 557b3d1ac..e34ef872b 100644
--- a/src/app/ui/timeline/ani_controls.cpp
+++ b/src/app/ui/timeline/ani_controls.cpp
@@ -44,11 +44,11 @@ AniControls::AniControls(TooltipManager* tooltipManager)
 {
   auto theme = SkinTheme::get(this);
 
-  addItem(theme->parts.aniFirst());
-  addItem(theme->parts.aniPrevious());
-  addItem(theme->parts.aniPlay());
-  addItem(theme->parts.aniNext());
-  addItem(theme->parts.aniLast());
+  addItem(theme->parts.aniFirst(), "ani_button");
+  addItem(theme->parts.aniPrevious(), "ani_button");
+  addItem(theme->parts.aniPlay(), "ani_button");
+  addItem(theme->parts.aniNext(), "ani_button");
+  addItem(theme->parts.aniLast(), "ani_button");
   ItemChange.connect([this]{ onClickButton(); });
 
   setTriggerOnMouseUp(true);

From b2365b557d0f906e2dee766031523f43a2158a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 27 Feb 2023 11:04:07 -0300
Subject: [PATCH 16/31] Fix theme initialization for paint bucket settings menu

---
 src/app/ui/context_bar.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index 931f429c4..24db7a69d 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -458,6 +458,7 @@ protected:
         }
       });
 
+    menu.initTheme();
     menu.showPopup(gfx::Point(bounds.x, bounds.y2()),
                    display());
     deselectItems();

From d88eb80fe62ccf354f1ad1ae9b37d0dfba224097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 27 Feb 2023 11:59:20 -0300
Subject: [PATCH 17/31] Fix theme initialization for theme variants widget

---
 src/app/commands/cmd_options.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index faf8de681..14d5f0821 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -954,6 +954,7 @@ private:
     }
     m_themeVars = list;
     themeVariants()->setVisible(list ? true: false);
+    themeVariants()->initTheme();
   }
 
   void fillExtensionsCombobox(ui::ComboBox* combobox,

From 672f37162259804c340e94531a9d1bc72db8d169 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 11:57:56 -0300
Subject: [PATCH 18/31] Add warning to ButtonSet::addItem() which is not safe
 to use w/a non-string literal

---
 src/app/ui/button_set.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/ui/button_set.cpp b/src/app/ui/button_set.cpp
index 4ca294f40..0818f5aca 100644
--- a/src/app/ui/button_set.cpp
+++ b/src/app/ui/button_set.cpp
@@ -239,6 +239,9 @@ ButtonSet::Item* ButtonSet::addItem(Item* item, const char* styleId)
 
 ButtonSet::Item* ButtonSet::addItem(Item* item, int hspan, int vspan, const char* styleId)
 {
+  // TODO warning, here we're saving a copy of the styleId pointer,
+  //      which if it's not a literal that lives enough for this
+  //      lambda, it will crash the program
   item->InitTheme.connect(
     [item, styleId] {
       ui::Style* style;

From fa4f0d1fa94f02d62c60830e8ecf20927793c8c9 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 11:58:52 -0300
Subject: [PATCH 19/31] Limit the brush size for preview to an odd-size to
 align the center correctly for big brushes

As now the BrushType button has an odd number width (15px), it's
better to limit the brush size to an odd number size (9px instead of
10px). In previous versions the BrushType button had an even number
width (16px) so the 10px brush size was correctly centered.
---
 src/app/ui/brush_popup.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/ui/brush_popup.cpp b/src/app/ui/brush_popup.cpp
index 0e4d46e41..c50066908 100644
--- a/src/app/ui/brush_popup.cpp
+++ b/src/app/ui/brush_popup.cpp
@@ -460,12 +460,14 @@ void BrushPopup::onBrushChanges()
 os::SurfaceRef BrushPopup::createSurfaceForBrush(const BrushRef& origBrush,
                                                  const bool useOriginalImage)
 {
+  constexpr int kMaxSize = 9;
+
   Image* image = nullptr;
   BrushRef brush = origBrush;
   if (brush) {
-    if (brush->type() != kImageBrushType && brush->size() > 10) {
+    if (brush->type() != kImageBrushType && brush->size() > kMaxSize) {
       brush.reset(new Brush(*brush));
-      brush->setSize(10);
+      brush->setSize(kMaxSize);
     }
     // Show the original image in the popup (without the image colors
     // modified if there were some modification).
@@ -476,8 +478,8 @@ os::SurfaceRef BrushPopup::createSurfaceForBrush(const BrushRef& origBrush,
   }
 
   os::SurfaceRef surface = os::instance()->makeRgbaSurface(
-    std::min(10, image ? image->width(): 4),
-    std::min(10, image ? image->height(): 4));
+    std::min(kMaxSize, (image ? image->width(): 4)),
+    std::min(kMaxSize, (image ? image->height(): 4)));
 
   if (image) {
     Palette* palette = get_current_palette();

From 11ef2f939b5ae71e5e2576482223c6ae723dacb9 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 12:05:37 -0300
Subject: [PATCH 20/31] Remove unneeded padding-top for brush_type styles

---
 data/extensions/aseprite-theme/theme.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index f0e3e7fd7..95ce992b1 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1063,8 +1063,8 @@
         <style id="dir_item" extends="buttonset_item_icon" width="18" height="20" />
         <style id="context_bar_button" extends="buttonset_item_icon" width="15" />
         <style id="context_bar_text_button" extends="buttonset_item_text" width="15" />
-        <style id="brush_type" extends="context_bar_button" padding-top="1" />
-        <style id="brush_type_mono" extends="context_bar_button" padding-top="1">
+        <style id="brush_type" extends="context_bar_button" />
+        <style id="brush_type_mono" extends="context_bar_button">
             <icon color="button_normal_text" />
         </style>
         <style id="ink_type" extends="context_bar_button" padding-left="1" />

From 9332642de991ebcd5b57e7c4cade35e7296b34fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 27 Feb 2023 16:04:11 -0300
Subject: [PATCH 21/31] Fix combobox height

---
 data/extensions/aseprite-theme/theme.xml | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 95ce992b1..9413bd1ca 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -180,18 +180,18 @@
         <part id="mini_slider_thumb_focused" x="48" y="176" w="5" h="4" />
         <part id="separator_horz" x="32" y="80" w="9" h="5" />
         <part id="separator_vert" x="32" y="96" w="5" h="9" />
-        <part id="combobox_arrow_down" x="100" y="148" w="9" h="9" />
-        <part id="combobox_arrow_down_selected" x="116" y="148" w="9" h="9" />
-        <part id="combobox_arrow_down_disabled" x="132" y="148" w="9" h="9" />
-        <part id="combobox_arrow_up" x="100" y="163" w="9" h="9" />
-        <part id="combobox_arrow_up_selected" x="116" y="163" w="9" h="9" />
-        <part id="combobox_arrow_up_disabled" x="132" y="163" w="9" h="9" />
-        <part id="combobox_arrow_left" x="99" y="180" w="9" h="9" />
-        <part id="combobox_arrow_left_selected" x="115" y="180" w="9" h="9" />
-        <part id="combobox_arrow_left_disabled" x="131" y="180" w="9" h="9" />
-        <part id="combobox_arrow_right" x="99" y="196" w="9" h="9" />
-        <part id="combobox_arrow_right_selected" x="115" y="196" w="9" h="9" />
-        <part id="combobox_arrow_right_disabled" x="131" y="196" w="9" h="9" />
+        <part id="combobox_arrow_down" x="100" y="148" w="9" h="8" />
+        <part id="combobox_arrow_down_selected" x="116" y="148" w="9" h="8" />
+        <part id="combobox_arrow_down_disabled" x="132" y="148" w="9" h="8" />
+        <part id="combobox_arrow_up" x="100" y="163" w="9" h="8" />
+        <part id="combobox_arrow_up_selected" x="116" y="163" w="9" h="8" />
+        <part id="combobox_arrow_up_disabled" x="132" y="163" w="9" h="8" />
+        <part id="combobox_arrow_left" x="99" y="180" w="9" h="8" />
+        <part id="combobox_arrow_left_selected" x="115" y="180" w="9" h="8" />
+        <part id="combobox_arrow_left_disabled" x="131" y="180" w="9" h="8" />
+        <part id="combobox_arrow_right" x="99" y="196" w="9" h="8" />
+        <part id="combobox_arrow_right_selected" x="115" y="196" w="9" h="8" />
+        <part id="combobox_arrow_right_disabled" x="131" y="196" w="9" h="8" />
         <part id="arrow_circle_cw" x="99" y="243" w="10" h="10" />
         <part id="arrow_circle_cw_selected" x="115" y="243" w="10" h="10" />
         <part id="newfolder" x="99" y="211" w="9" h="9" />
@@ -619,9 +619,9 @@
         </style>
         <style id="mini_check_box" extends="check_box" font="mini" />
         <style id="combobox_button" extends="mini_button" padding="0">
-            <icon part="combobox_arrow_down" y="1" />
-            <icon part="combobox_arrow_down_selected" state="selected" y="1" />
-            <icon part="combobox_arrow_down_disabled" state="disabled" y="1" />
+            <icon part="combobox_arrow_down" />
+            <icon part="combobox_arrow_down_selected" state="selected" />
+            <icon part="combobox_arrow_down_disabled" state="disabled" />
         </style>
         <style id="drop_down_button" extends="button">
             <background-border part="drop_down_button_left_normal" />

From 5ea89141fd1ba759d4a1ae2fd9f15818de5b6078 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 16:48:50 -0300
Subject: [PATCH 22/31] Fix regression with Pal Edit button

The icon/stylus was inverted. We've also moved the icon for each state
to the theme xml (so we don't need to use setIcon() manually anymore
for this button).
---
 data/extensions/aseprite-theme/theme.xml | 12 +++++++-----
 src/app/ui/color_bar.cpp                 | 16 ++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 9413bd1ca..0bb90158a 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1074,12 +1074,14 @@
         <style id="selection_mode" extends="context_bar_button" padding-top="1" />
         <style id="symmetry_field" extends="context_bar_button" padding-top="1" />
         <style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" />
-        <style id="pal_edit_button" extends="buttonset_item_icon" width="15" />
-        <style id="pal_edit_button_hot" extends="buttonset_item" width="15">
+        <style id="pal_edit_button_lock" extends="buttonset_item_icon" width="15">
+            <icon part="timeline_closed_padlock_normal" />
+            <icon part="timeline_closed_padlock_normal" state="capture selected" />
+        </style>
+        <style id="pal_edit_button_unlock" extends="pal_edit_button_lock">
             <background color="edit_pal_face" />
-            <icon />
-            <icon state="disabled" color="disabled" />
-            <icon state="capture selected" color="button_selected_text" />
+            <newlayer />
+            <icon part="timeline_open_padlock_active" />
         </style>
         <style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" />
         <style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" />
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index a47559943..d3e8b5945 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -186,11 +186,12 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
 
   auto theme = SkinTheme::get(this);
 
-  auto item = m_editPal.addItem(theme->parts.timelineOpenPadlockActive());
+  auto item = m_editPal.addItem("");
   item->InitTheme.connect(
     [this, item](){
-      auto style = m_editMode ? SkinTheme::instance()->styles.palEditButton() :
-                                SkinTheme::instance()->styles.palEditButtonHot();
+      auto style =
+        (m_editMode ? SkinTheme::instance()->styles.palEditButtonUnlock() :
+                      SkinTheme::instance()->styles.palEditButtonLock());
       item->setStyle(style);
   });
   m_buttons.addItem(theme->parts.palSort(), "pal_button");
@@ -532,13 +533,12 @@ bool ColorBar::inEditMode() const
 
 void ColorBar::setEditMode(bool state)
 {
-  auto theme = SkinTheme::get(this);
-  ButtonSet::Item* item = m_editPal.getItem(0);
-
   m_editMode = state;
-  item->setIcon(state ? theme->parts.timelineClosedPadlockNormal():
-                        theme->parts.timelineOpenPadlockActive());
+
+  // The item icon/style will be set depending on m_editMode state.
+  ButtonSet::Item* item = m_editPal.getItem(0);
   item->initTheme();
+  item->invalidate();
 
   // Deselect color entries when we cancel editing
   if (!state)

From 0491bf60d76c5551416a0a71598c0f11422b4ec3 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 16:54:22 -0300
Subject: [PATCH 23/31] Show the Tiles button highlighted
 ("button_selected_text") when it's in tiles mode

It was planned to use this color for this button when it's on.
---
 data/extensions/aseprite-theme/theme.xml | 8 +++-----
 src/app/ui/color_bar.cpp                 | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 0bb90158a..6ade87878 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1088,15 +1088,13 @@
         <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
             <icon color="button_normal_text" />
         </style>
-        <style id="tiles_button" extends="buttonset_item_icon" width="15">
+        <style id="edit_pixels_mode" extends="buttonset_item_icon" width="15">
             <icon color="button_normal_text" />
         </style>
-        <style id="tiles_button_hot" extends="buttonset_item" width="15">
+        <style id="edit_tiles_mode" extends="edit_pixels_mode" width="15">
             <background color="edit_pal_face" />
             <newlayer />
-            <icon color="button_normal_text" />
-            <icon state="disabled" color="disabled" />
-            <icon state="capture selected" color="button_selected_text" />
+            <icon color="button_selected_text" />
         </style>
         <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
         <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index d3e8b5945..29d157560 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -200,12 +200,11 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
   item = m_tilesButton.addItem(theme->parts.tiles());
   item->InitTheme.connect(
     [this, item]() {
-
-      const bool canEditTiles = this->canEditTiles();
-      const bool editTiles = (canEditTiles &&
+      auto theme = SkinTheme::instance();
+      const bool editTiles = (canEditTiles() &&
                               m_tilemapMode == TilemapMode::Tiles);
-      auto style = editTiles ? SkinTheme::instance()->styles.tilesButtonHot() :
-                               SkinTheme::instance()->styles.tilesButton();
+      auto style = (editTiles ? theme->styles.editTilesMode() :
+                                theme->styles.editPixelsMode());
       item->setStyle(style);
     });
 

From 6e2b44c72d811adf87fdfb4731f748266e6a2102 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 17:44:30 -0300
Subject: [PATCH 24/31] Fix Edit Colors and Tiles/Pixels Mode button styles

Now these buttons look more like the previous version, where the
special background color is painted to the edges. To achieve this the
"buttonset_item_normal" part has less border to fill the background
with "edit_pal_face" color in "pal_edit_button_unlock" and
"edit_tiles_mode" styles.
---
 data/extensions/aseprite-theme/theme.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 6ade87878..b43f17356 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -203,7 +203,7 @@
         <part id="toolbutton_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_normal" x="96" y="16" w1="2" w2="12" w3="2" h1="2" h2="10" h3="4" />
         <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
@@ -608,7 +608,7 @@
             <icon part="radio_selected" align="left middle" x="2" state="selected" />
             <icon part="radio_disabled" align="left middle" x="2" state="disabled" />
         </style>
-        <style id="mini_button" padding-top="1">
+        <style id="mini_button" padding-top="1" border="3" border-bottom="5">
             <background-border part="buttonset_item_normal" />
             <background-border part="buttonset_item_hot" state="mouse" />
             <background-border part="buttonset_item_hot" state="focus" />
@@ -1014,7 +1014,7 @@
             <text color="slider_empty_text" align="center middle" state="focus" />
         </style>
         <style id="buttonset" gap-rows="-3" gap-columns="-1" />
-        <style id="buttonset_item" font="mini">
+        <style id="buttonset_item" font="mini" border="3" border-bottom="5">
             <background-border part="buttonset_item_normal" />
             <background-border part="buttonset_item_hot" state="selected" />
             <background-border part="buttonset_item_hot" state="mouse" />

From ff1211bc84e56947ce0383128fc8c3d04ea62aaa Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 18:02:10 -0300
Subject: [PATCH 25/31] Minor changes in theme.xml/style names

---
 data/extensions/aseprite-theme/theme.xml | 10 +++++-----
 src/app/ui/color_bar.cpp                 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index b43f17356..db3f3875c 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1029,6 +1029,9 @@
             <icon state="disabled" color="disabled" />
             <icon state="capture selected" color="button_selected_text" />
         </style>
+        <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
+            <icon color="button_normal_text" />
+        </style>
         <style id="buttonset_item_text" extends="buttonset_item" padding="1">
             <text color="button_normal_text" />
             <text color="button_hot_text" state="selected" />
@@ -1074,20 +1077,17 @@
         <style id="selection_mode" extends="context_bar_button" padding-top="1" />
         <style id="symmetry_field" extends="context_bar_button" padding-top="1" />
         <style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" />
-        <style id="pal_edit_button_lock" extends="buttonset_item_icon" width="15">
+        <style id="pal_edit_lock" extends="buttonset_item_icon" width="15">
             <icon part="timeline_closed_padlock_normal" />
             <icon part="timeline_closed_padlock_normal" state="capture selected" />
         </style>
-        <style id="pal_edit_button_unlock" extends="pal_edit_button_lock">
+        <style id="pal_edit_unlock" extends="pal_edit_lock">
             <background color="edit_pal_face" />
             <newlayer />
             <icon part="timeline_open_padlock_active" />
         </style>
         <style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" />
         <style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" />
-        <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
-            <icon color="button_normal_text" />
-        </style>
         <style id="edit_pixels_mode" extends="buttonset_item_icon" width="15">
             <icon color="button_normal_text" />
         </style>
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index 29d157560..67dd48cb3 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -190,8 +190,8 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
   item->InitTheme.connect(
     [this, item](){
       auto style =
-        (m_editMode ? SkinTheme::instance()->styles.palEditButtonUnlock() :
-                      SkinTheme::instance()->styles.palEditButtonLock());
+        (m_editMode ? SkinTheme::instance()->styles.palEditUnlock() :
+                      SkinTheme::instance()->styles.palEditLock());
       item->setStyle(style);
   });
   m_buttons.addItem(theme->parts.palSort(), "pal_button");

From 05dcf9633356c235009c537e6d76d105e5b8ed50 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 19:05:26 -0300
Subject: [PATCH 26/31] Fix style for RGBA/Grayscale/etc. buttons + Edit
 Pal/Tiles mode buttonsets

We cannot use the fix from 6e2b44c72d811adf87fdfb4731f748266e6a2102 as
they contain different slice borders depending on the state (and that
generated moving labels/icons in RGBA/Grayscale/Indexed buttons when
we hover the mouse on them), so we had to revert it and use a new
"buttonset_item_active" theme part to set the background of Edit
Pal/Tiles.
---
 data/extensions/aseprite-theme/sheet.png | Bin 15980 -> 16126 bytes
 data/extensions/aseprite-theme/theme.xml |  20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/data/extensions/aseprite-theme/sheet.png b/data/extensions/aseprite-theme/sheet.png
index b16b901ff92e0adf5a5b0c90df7fa20c9c82f54a..d32ef086ac66ba6707992b74751eeb92a10019c6 100644
GIT binary patch
delta 15964
zcmX9_cRXAF*N;`RwMT0eMeR*%*4}$75_{7YtspLHZ?!3^wyI5Q?_GQEQY$tgi1p<A
zd-6*1$IZ?CoSU3`&U>7D;C~NG5C`1K>E@to5B<L}2(W{a<z!=+138LS^j}34_I&W-
z8`_&ZOdAiA&8VCDrsB&wiTR@QyPHl~%u$qI<J*_Mk(7epup>OgoT6JI>ae?uWQ0>H
zI<3=E$<!mrzIl^JE5#@UhR({7)XBd68ZiIbGxxQprNd~;!4aaFW_cw8@zoRf_;I^^
z4C?m?WE-l<{=%(HShQ@mwF0*Cfmm@f&m-IyGUhelC7vQcG-e*7w&rzT4Zj%U1F3MZ
zww<AtR+BDDB|Jh&<Q6zKy~KM_C|`~{SJCdizA*8LRpI_P*Y&%b%e2WB&%<Y<;MIxY
zLX&+6hx%A?Tr0eVisngpx(2{j^x^aH$LU^Q_qR2_VC))%DjZv`qJ&!QZEbP=z>VHJ
zlzwhA_1g95r{JlFKV!E<mRF1Qf6p%gYniy^8^}8pm&6!##V--i)zH4jzu1Kzof)p~
z0V+pF_t2aP6iQr!J#m$yfi~nwEYi3Q;DxY#z&L>=?(grXYZcGW&jShb&8NXQJ=Vk^
zwfPasWIg<Jk+t+_orQGEx$1|>)=TV#fU|pLu9OAg&z*0YMiCJH4qL(MdpsqI-tQ~q
zvrQFm2;^`eqFGNpTGF$s<Hg(w+PsdXd^RT4JDuj{Vx3Cy@Xjo0;zHjXW)nU7oKPo7
z{`zfZf-f{w3%^vBUmcL~*N|GB^TtV~<gjad9Nt~=V~P#aPptH?o|scfZppz`FynU%
zSBlba$+{+6X3n7N%UmX`-jvb~Js${60S|+N)y?dzmo{ufoixs-6(X3Sv)<(++2<q4
z>&53I`G$=Q*+C}H2Vu45QW%JZtN#;smlCBRI<qf03yIjtp9BUvAtXAze-n@O=)FAr
zUeU>=sAi^edFu+Rk`e!z{iSeIC^yMXIE`S=F{x|~R|xS}GR_=ACJidQT-O`vIcT4r
zf}VYB{q$vvCuL6Ykq7oq7C#7Fg&AU8Y1upT!`P)5x?^^A;*vX&70<<Hot+mV3w_n3
z<AZAd;?+R>=rhoDnd7~=b6xFISlAFqFHy7A!XHP!fcdx0#~>4dEG2vO(RLWxq8`?5
zwQ69X89_-|-K04{p{X<XwV89*GX2xHH-3C>`X1@1X{stj+NYjsmbXU6H@92#7@*S0
za}t3Jjq__|#6p{#%1;(xp>!$aoSv90sC-QI3tN`B!37YF_Y9wP+&3yV_Aym;n94**
za^~+6zS0vrQ|t&!l1ZVZRn=VuBl3p(*Kf_RW}%8|J)m=6@m}&YOM;w%XX4;;=7x#B
zzgfA+@I=Y{vp1ny{=t@E=)_9k`Wy61ivS~^`s@8x`l`Of9Z(o;|BB99k^wg|K~=$E
z&3r(Q84SqeU?f`9UEj<T`S;-Q*H0YUgbbeASY@_6yII*|(EdXw2=dc>{n>$z`MIH#
zf<w-tH^kOw`@7^tqhG$@Pn|SKAMqM>N`QFw(2b0hrEb1Z)(C&r$h+%F&rW#dfh2f7
z&6y#6zv~@ry%1bBA3Wxs+ab^1&CagHmh@*k!x6aoVO*Jdfb~A0q6zc754crJ{^_nS
zo9rf9aa=p83GOT!l-!@~cLDZ1FE{1_Hb09*!{gHJ-tT3`Yig4YP_eXMptx3v+?x?L
zBytc>g#0%bCM#rzMs2*Nx~6md{nr&~CV3oIa>l&FA9mm*c~Duypg~rp`b`?wqTr)~
zWI#}<<Node);zrJ2xo{lHMdmk@QN2wWuzGzdD9BT8}@SsH;%36C5=VYF0lt6Xm04w
zwXyNpXseXXf5%1sA>gNbLU=jgBRP5*-~Uf5MA(oq9S%E4@cBtjvQVIIU+KH+<N>p7
z$M%D0sC_Sj?N)y?pR159D6j)uxQF$af!EnugoGuUOJ3qQe{w8&Zd~Kirop&pWT17f
zw`=_E{9w!zJ(U%nT-H#jDMqAGLQ?PMY|o3tC{n6-hkN<W*>NSj-PT8vIcXlxI?ze+
zp%05Tr*XHAQN}-4h#?(yloAo@Yh5i1PmUduE;thR@>2C~3AhL?4tAxD!tI*^2={b%
zqb7p!l1G0wNvA+c6SeEdybkR(dv8Ug8U{26Ms+tX25%U>i)wpY2q**BGom}YhYWhG
zd&;@mP+j_~2<0iWji3cQe0H0!Kei%%_NGr1SN<kf_JY|m&p>MvzYxy5eF`Wa_T^?(
z==m;L!zxcUCTyDulN~UK$efV`ymfW7hb3yX0Ta0Q(|6fT_D}0ZpMfMl?IrT=S51$L
zByzp9HfWg+u`zDp>v%`bYt!>3j6Zh!ZRM{nLDHJB)ErUTi=r1|Olj$qlmbaUucze6
zd1w3$h#A*)gk=@7bJJaP$xAJTS?2;#`Xn?m=o(;j`k`F>Wp@0a?RO;!0AWa?;lXd&
zUcDc+|K!n643exY#tpp0#}L{?%MYZ8NaJaTBI+wny!kJd<Vt0dvFhPj36IzJeTwLB
z)kD6H*#8c=L;2hOD)Qlw__pY)Sp?II&?9mIoqNY>;FSDQ%!~pJdG@GenyHtd1}r|U
zgznE(QfJ~C_7a*%5xXXq0Kd;(aH#(a3hk+_360Jev8R#o2ahWlO;tvdvAphoYs_rf
zx}J0?^GqahCd^rsb1#B=itmYs6r|-hv4_<23wHZoy@KW@ANXmmlzx8*>&|2NVDjV<
z7M-LI|0@O)l>zIwi1Fu^WQalq-5i>WRk>VlE%YMSyOx@MZ|f2%HUK+u_ThIUyf|#c
z<wIp(bTXrqCOA0I@toI&^kK1(;~-$7V=nwO1M`kQg$+IoVCkDr*RxYdzYX3};x>}{
z9A(64Mw)H>90wMMt7N~ilo?AG8*GY)j_|qR`83O=w8^WY%mg<-h&mIb!#qT8a-pYq
z&<BE{&-SEuJ0q_L$anE8^83yZw$a1}>j(Mu->DIpMBq~Vy$(S#HMVVXBI{>E8k^b-
zxTZ~?GVS@k<CYu#{HLe_?;D8}vq_2E4*OzAxf{mtzaUlOwm&}>xlX_2T<H^M`}b|J
zKK%!U-&mv1Wzm6=5AKCmeW@Y}ZlfFffl)M7+H>1vQsBf3Fq3oRcW_vOb_bww>Mj4p
zJyUe7e)aUb3D))oV!2egoPNsTm$uK!P#IFK1@pj-Tpr<L*>tu~KZS1MqdpLEbf@7t
z_%%N!l(-@#=mLY$Ujl4LZ~?wsEA!i`oP_u$cURY|(b~fz0#v{>-cMBf8{r138h*o#
zNza-(pc3mWPApOC(cRz9&!O1Pi-BH$EcB4?gvaQRUm}vmR+E*~IARgC6_%}LD9H?3
zHAJ;|L<7zMuix0tODnD{A4o!+eSw;>Vu$tqqJZ8Fspm&_6%NF4{5^37W|EXX8RrvI
zr1-9+6Y-?sjS*Yw0vby_#%{(=&|VP`W5U=3#*7Ny?%s0RYmtu(;wbH9F$_*QR5IvD
z&=7s;!6v*8U`vX8K9)iuuu(YljaJHt^6Z=Cv&qI!uCA^TMf}heLK))n_yR{QHL^b<
zRx^tQn+s(kUq~YcZJBG?Y^>UUET>}<HMF(->^D?b6rg+Z{^YN0O#eT#4VSaM^w+~@
zIzap?>Ay&PrWY$J3|(nO#WcM?x@=833S-Fl`h60AmG{8ko&4=wBoDFa<wCs6Z?RZ=
z^ETHC!-Yh%C+4VqulsuzuMU%wuY%rb=7@dWQ>v7py@%<Cea8`rJ3mgCN89$_cds<a
z5<8hJjY!#9;+YF>lpj}cd|FFeuJTrs?a%<&v%9a^WFNjG_`r`xCpA4p!wTT|TBmyS
z@Vx7i2r6b;2*HKIqtCMIO@<>zZxP;t8F<Wb!LEguO!Q|%2*Jn9p@K9-n`pQb@ewJ$
z?dM^wpeG~4s}bx#DGgJ@?KOJC3qhw3#Kr~-6<bqX9fa;8Eg~b6G+awzur-|>KwDPA
z%ex>s*!=}DTzyKc0^DvnPhl%OE^*h%Y?&vfX~oZZj%z|Lz#@J6jOY;>vtIvAE5ju{
zd>*eDnTFzKvU9n{g{rF2$n|#hyn9tAVkqCzsAu8tJp*OrH(teM1Qx~Nr=9(|AIm)H
zZ_tZB4|x*^OGx+_c}P*}>G2A1znfIJQkY#OXR-uA$Sa@w2XBcVaj~EOKEi%EHX)EG
z9v(#vVh!kI$;-6hM=kd0G{r^c`a#;5G{8!Rhm7LaF*?lKi~j17a!S8kovbql!|I@j
zxbF{;-PL))?=8fzXp+j7skSH|3=&#e+H`d7`FOE6)8!|R_l?YU2otChOJTv=;7H9h
zLw~GADimo<yc3Ue0bFAn$Q+T6mti*Jp&=r~RZP2hYEt@e<Ika{(*<k_K5YvwBYxkj
zo)z$C+q<l;LYOnV^hkPIFJp5}Nox9QWz$8}o}Ym1c5b1#@~H1FqJ=Y+_9DY=F07KI
zb<mOa&|pM;%3e(yNaKWO{p5w|Uph{k4ULm>l8veFBHNxA*K>CMd%QgtIKstp6ME=N
zN-A_}qr5}GR6A*$@rdCcTdhCsX}N0`1QFoY_4h4<Eobq5(WYDy&)Jhj4Z^PdMcS9b
zvUFLVog$K}#;Mynjw_Gf&hU#9O%bLliQLc;bAR5>MYVWJ0(|zY9K!kL^O>4xx-zrJ
z@(O^m&y3KS5xY!P7D;vU^B~$3PJcHQP5D5Gy1ly1f_=<EfoP!lok04dEf;6&XLReo
zHxaqhb<sBW9ehfx0hDLnm(-tjUz+|4f_tCQfhm*c5si>%Ou4v4N*hH}PFA!;k5<`F
zUiw?o!F>R&D6&fJ)d$Bm-RU;I6~FlRyy>bf8fdmfl;KgN#ALjvpU+}Q%H$=7%Sc10
z$-7-4xb@wMVBJe2T4ru;?mBWnL-^dRj7&dH%S+OGkAeZXeg9S5n^RSz$}TJ{ks-cc
z_Im+a=G2_%?kNaE2>REk(tOK-v)hO-PO0-n|2Z(sNIswwAM&Fo`t-Z@O5V*-<e)h{
zO1$Vzzk<G#kK3YgNwg*3)O!L#6SMQAmM<fWN&S@nLgBhx$+&$XQ?q6R6*e2Sfra_!
zEP1Og55{smdtUKXxU*onoA#2xvbiD{0q3{9dZ%2iJYo$+jPXl>Q<EMSyKfd$4dMCo
zRZsxJZN1)ulqh3&Z`Qff3ID~AAU)<H$v`;c_AT{k29l%VK$0)cR_2J)V@f*Pyu(0}
zpBzSP(|w+1a{66Vt;eLLt4f5{ZKqu;Bs{@EHgi_FX;vdsVTe81g)=$!&xZTLb0#;*
z8B4e1;=<9=dq9z7AmH`j2>G&c7lVn2H8o&heAvF%v=&{H+WYTI+qx52vZ7*w{ioi4
z;0pSTymp~n*lDKcYW?Q7D!ta0OQ;lokqDZgd|B`vD2bh)Dbzmgh`AUSmp1NtOc?oK
z8^~TGsQbc?cXN9?T+fcOcUh=TyKW{oOnw8Ja-gX_db;3(x9;;h+N7M_YVNzWKTwkL
zN=!rC8O#rhP$DJM{9M2z5{k~=s%-K$*^HEqbCp-%=gN0!GB1;1ThHvzWjg{xBXIlp
zf1+`(^4^7yB*TLK=<Ak?H#yrwqlne>ppa#4f#EN5j5o8qOcOe=jSnAhLZ*Ke?YFwB
zm>v}i9(o=+G=)c{!CRkD@=e`50~9Xod?n&xnABf_*r#mbq8L0WrCz~g)zmkmI^l$)
zaZBi$71Kbe!0oMkD(5Y!{yNzpecI2WT;nD^07A~S6p&@YN>*)z?W+0oKPvDW8S61!
zdeX@K7aSQI8|w)gT_WlyUUL8pP~Df2gQxkitNdk8{rla1fk3N1`xXEwK_v5+vjAr{
zF5ARAMw5~%JgZ|!{AmwOk;|FxfXmvI(xGY@)0q7M7qJY=<$C|Fo#-ocZ_RK-jdNX)
zUS6J=ibYWGNuhdAru8d2wP#0#%&`w7{L%8f5HtvRBuYFK>UK@4U&Nzb9{=*Rtfnpk
z-$s%lKCF8^;^XrEF$ZA$F^7?U)fb{5addGBE9OUoLa7q*uYRXw(l>BF^_$V?Y<JE&
zTgQ$14;w3NYCXGt#=fl9=ddW>kPt+kjIH6E-K0uP%IscZp633WAP3Ci<T%`4_DHSD
z-f1gFi51yO|6ZoI`fJ8;nP(>*);Fb&<TcKW#wtR>)jq0JvOri31?DVyf%b3IONh6`
zt_5@7Mz63YALg?sW9D_M3KcdmrO3wnb`Ly(RrjujGM|ZXz46%IXn{n74voZT{u8vL
zXhyerrHjW@;FLutGjuwTX=k9=Bbb#4H=#de&QA{g-`+L&P@<04>NR6s0>rMWFNO1{
z3-L3CEOmj}h2MA<I2!RPRI!+zL1rHlt?5o2ZTM&~Ua79Wm9hgR=%r2)GL^&S2fMUV
zs(7{=6n!p~YzsX!1Wq#`1bJSIM_A<6Ej(K%1u}N60esZlmf1pbx-oB7<Ij5@oni(i
znX2a{w-JOzP)t%L%EgZW*zfw*#<CJTTJH%0?(>0%ay9yEYaTss;RfD(akwG5UL-B0
zJg1K{KrM9rl&=D;y8qcWHqu2YfIoEV{mlN!ESBJQCv%iY{ZzH(WSUjo$QPCxC&oUT
z$Egx>zaySbO~gT&`Vv0)=pC0E-?&UCS<$e)&hLO#+-dy6Rty**S5^v8F-fai_mZ>z
zkRb|)W8GVD#J6&7&2eXOebsW~KJ5r@$DZ0De%!BrNvQq4Q{~NKgZQ-|VL#rspSP_V
zcOji=U01sFmyccWl6OOfM@%#Rf3Ww)dF1?;laDMoPAigsD@JVQC!<lv0J{A*jSK5%
z!<mGx;5)^hv!bG+(*l6W(lrIXY5m%_I2fQ>P=Ku>N|q3O!(kk%i<EJs(8H@vTDe5M
z+|*i$s%xauQ{y;A!{F~-a5R?=LLc#&93FZRaI<1Wyu?P(x&=pjKr~4%|0YY&^`hdE
zi?&oUXvA;evWM$cz@3*kk5tP)G_>WM44aZBXSfh=Lew@$QSzf$6l$z6Z0G>jXUM|_
z^YEcfOtz2?w7Avz8TT`hn5gI(trmXzNHn>e2@W>~^sZJ+U;~E)LqFG|HI9;BuZ_Pz
z02hz2>Qm|%W?%WMGT75eqQb+877G+QGS3C91k=pTl6x*QBU|&^TWGvjmR7Osonx6s
z(*&|9pu+mFb!-35((|7d3g~p*r-5(#D%o228B3Fn6_vY<)eUzMni$2Jx7aFZ__GF1
z!Rx9@Tl|r17{P2MUf>v*%H7Qi2p-pP3R}THF#}L6^cT}Njb`q;Knzb(U)TKvf7gAT
zbN$FV-C=*ik$$!}&v$03_~us;^skhk8>@CiT=@)(Me0QOl*THS12Pn-4ou*DC(JK8
zsrd-&N33Rv9BRCP8)@}4j(U_w%7fR>dFP5x4YM#-4)Z56NcC#?Lm_@ENE69q*F4!5
zr3Xe)!Y+7Y<o0B~6`hx+lGZDB<`aa@dmjaPM;^&Gj#6r7`RQOF;}8TOmiS8%XN1?Z
zhJG>rQ<gWgZ1y97xR<Pog)(%5U#U>fR|C#Q*aAJvQo)}`|8s@<cd9?0L(aVil*S70
zbMTU@B@eF#s_XH^n3mZ0zA7%S6`ubLD8nNV)9k_hBa@sNN<2L1Vj~)0yt~uIs)7>8
zYTXZpU*pUa;x?3JUvWcFnp9U9gp6gwg$fqds1FwiCttv=R;;jkYh?hp3`0AA7n_RT
zTR%NBFphYBpLj-Oj}D%7{1pel@IT6U&9oshL>?}{d>uco`ALCaPtED8+TX>RYa@U1
z*W-%ZoBmERPud=c$hj@wBm~BS4qOme(^iKE$Vh*ado%!!6Wlg|xEp*Gf$fD57iyyS
z{5$}s1LPvGFb3TXeyAxI;1zezTX{rUWy%J6oy-j6i#Cjle4e6qUb{{Dr_8nRSPT4L
zq5CNGw5YfoV<zi`n;6qt<42yCD>s+NV_@w##@@f@I5CWEd}ZZmnM9y#M?8o-kZ6kJ
zTJQTWOMrFgq(MSv_FSG5bO41Mn>UA{QCu+Kif-mZimo4SUlt@^9TXqO*2r9L6sC_k
zxUx394=|T(@K(X>@HlAs!#u>zs+#-90@oN=q~FJVcYpSzAeq@#0)XOvDyP2Tv^o6o
zJY?Wk1@ylRM9aVbNx+Q>^_oc6H~4QBbI56|qfsk#KYH*m5S<j03`V|8N=^FGz<jFe
zn~3=<NlsSFsOx<{+X#!58jj6tV2|`ISrCKMUzWynW|rh!grj0+E@9(46^_E&skwXo
zX{GH~B17o&g>Ka!mo;kREr15NDq+U<BiiDhIOnC$5EJL9mdX;(^Z8k({YtBd4llRL
zd_O&=ob=9{y;k;dayfhA16Fs|zy_HUIbkMhoJRIQ(3|ev>3dgj(`An1m^ypG>uXvG
zzGyTmO?pm42^>B+%k}6*XcLfn$x0QMF;grV_mzvb!m$YbLCWB2saefdW1-WFETKK2
zaHO4KVTDiO$yYk)wD>2kF3}BCT?;&vWU1bHn!lB_idBAIA?8I%@_T(|BjuLB6Z<s?
ze^pT|i7XYLQ2qgs5Mi1_=rmlL_Kv*fb%<)6T<Gu&K%pTe(#3Acf$E{KwVm|henCjZ
zC&uz;EYU50nMCe@fa%G6gOQ6R233_kN2Cc}StV!TI|J4_-p`%SH+?Kltxna(DjfDj
zxFJ#sBE)W8q?1n>-{w@(fuU$IJ6%BoKW!Mn{96*2imy*4`!(aw5iEVrCOOd+H2;sM
zUm$1zWYBnjYv%{-Xm^<#JXJj^S&{yMrii#4qr<b90p7%*wVK`<B{56<cgSTewni5X
z;d>gX`PS)pah8bD=1Ez8bd!4Y_Uf3F?EW(+GeouU7QY7LuI4LxS~{(8tFH<xjMaD5
zd9tsXyO4q7MF*}(J&B^qjA+X0wy$1>$8ErLxT&;}S;sjP@<BY?8U|Z&Mhm@F)z!LW
z>1d=@h)2TqUjS%`HEk)Azh|=EP9%x&y|eu*FD}&ltuAQOaFneIiIRh)myP??x^?Db
zrbf@Xiq<|WudK8Y&(=#!;DkU_+7k)5OCr<pli0U=b=ql~b(u+%zGzsd_|*a@rahcr
zG(S-80dp5tDA~^FFM8s=>eX#+PnfX(10nM4xt%F<ZEtslFW>j0FzD`gaXtOiTREW+
z=p)lR2LD@lNg;_`gsz4!7S1WNL_Q{+bc1)vr0Y$>#TUaf^A0W8$}qSN6+Q_iui;}b
zG2X?(Z`w(*{+4GL*3INa47k3cd$e>s5+fGRhH1}4@b-zVW!NTJThSb(X<Vujk66RR
zlCL)1TP|&%_2xOGZ}+jmfDIrbuB5?6{+c14P@>jOaFsSZD&cL+B)(e2i8qrq+R=&Y
zw+VuJ5n}vKW423w6v*kV%-<Q)#QED3V=605Pfaza*yL)>kbdd=5fHpr<fPwYV3NK5
z&V)>W*tb?U(A>yGnlu_EDHkykwl{&FO_=_e)6!zD@G*+lGD=iIL$OdtJqc}Hl=y6|
zQjv1+wuk<=ztyjOf`WoyE=<OQ2y24Pjl%Ex3NhklXi0Jr&V7akIBkVa!kYKu9Tk^e
zypX2wLO;tN%+>%bQhJ@`LheKCtsfgRmA+Bl4#t2Y;oe=%d!Ky_^93lwiH2%Z4MGyF
zq3QV0L+1R%srezidIT4iGOL;+i-pI`vsFGRC4y_}hz7Nr>c0%(S|NCm+&r+>lS@O7
zn+`Ag+6>RoH_pw^RNk6o4BBqEb(P@E{EyYD@O!@k=;x9j8>SWYsz=W@oroE$_k3kv
zn*I`6h@|7H4|(~K*`=XCWyUJwZ)Eu&<|>N2AZEX9YaZ(!^}Jb426Qe^-@kaq&%=tD
z`Zw4r6|<2W25~X$VaKsZSt1LqMqhPB%9|T0cVI_tS1VKp6^X2P95oWtDm5PM??oTT
zth53Na<kF81FT9T*beEI37Um3L#u|6d~^pvBJn@s1x%I=cKlTwntrm#^rcE1Qisuu
zsXoh$tCMkEhhVs1Oi3=Mm%8=ZDIM8K9<izlG#v6SkIqVl6)84If7puL?H_98{)w<e
z|BL}viZNLUJb4Vx`{cYUev>#H7xHd4Ly^GCxjKbjr>w{{yal;Xcgp8N2Qc->cXm6_
zrGb1Cg;PwE4&O*Jf-JF_*`!9N*NGd7V7{3@mki7`TGwv#jFi8#3*TQ1@)jr$YYx~8
zXgOcxF-xB_iR1i?cF53I%M%odr23Ft&Z-2`5|7J$0Z)yp|5RbI-}GcyO|`{(wxAj4
z`4P$P*^FIl$224LJ2ZM=Ns#3Le_C{ixiF5eFyd!+d&`tJeJW|bPoYWD>U5?;ZUoLZ
zW!ag_-p%}_+K6j`Na_LUwD5+i7UCfK;>Yg8Z}P^_vRu8i-xOgPZA_T12pM)XRd-!r
z!MB(8y7UY2ZuDQ+<isc38cNSf#R*;mbWd188F!!1&S*FT*ib1wH(qx{_z!_T8Lt5e
zUk8tzw_^F@8=^Z;^=|1T&6nH|znH2n%)b1D$4o8?-`<J*^Urg0g_$yqXtV0To|Fyn
zYxt@$m{1;bu}&vBTW|ab-(@RMBd>vGe*e*j$8``S;KVQ5IR0LLr~0S71zL3ncv;G;
z0^gGhlER3V#t3UN?80%lA9GU>)kdL#G3oMUp2vTXy9tSA7E%8D7sll*9-_$>5)P4Y
zfg+b5TGA+&z91*07v+*T^20lnTmk&+LEiJ<XN#Y>78ud_c{;ma`FBV9186MU7aPqT
z*#?ddkob~US5sHDG69sofR$?jWLqlMnwh#UjQWUHH8sMJ4w|}HQh%RQ{Vg*AeN0TW
z7Z+aHa^EoZSO3#$6dHu2)5)l{ze9UWpBcfT|Et#P%@DIKw4L?bK!s5}fPz^1-m6>0
zTKvreDQ{@DKtZWRk!<;y11C3pswXM&GH9hb0Mso+-TKG__+zQuv^fa^F_fz+$Qq2~
zzEm&;gD<0UH}nssixaKPO{9J_a6(S&Lhj#L77_JhsjCmTA`E}O+(#15)XeQ9L$_lm
zyh~Gt2p=0g)d~0`@Q542k*KF;tGy-q1TAf1QR+ERDwK2CQn_a;y?gA2TA*4|9|n>%
zy&lr?-G7_`pN*g9C?$rqFv_dp8xPo|^iBLC_04~pp;bINL!EIUV|Ix9Iq26dx^OhB
zdUr;&mU1mPyuS!#0E2tSjr-~Cn)a}+Bv4#djSP-!G&Vs}RVWHx;l;1~Zk(|r<inD$
zxZ3`qrTm}X%hVpyFBn=^ZKEwv`ZJa@n(>vDhsU%)*E^|`m$uK*{o4jD0%xf_euPzd
zDU_jsmR*GzXrF{z`Z0xE<URd&>J#wmHNTXFBid<=PEZr0dxD5PihtovUd|!Fk!?g(
z$#2rJClAOn6?(aI#_nT^M4CkS==xdo$n``AJWs;A?jc0nv;PZnZP(TyK!(kw^f=0*
z=$(Lvr=M1FyD(G3%zMy2PyO{Px+kBz4|GVQN%@>*=$;5<jeJKR;M-?hVocBz21y!b
zOV!fJ1D4fi3HYff>0MiWd+5tQVPYf4f~S24h9ZP*qY6fLYtb23auMj7iH5jLg~B5}
z#-Ab&?Jw!UUe1r-1V%hb5R*d8VIVo<yMRw$yf@~eCi>2k{3*_|UFJ^uh`ZRnw;{l7
z;Kfg;!+d}D#+oD|ERgDQ1G~$U-$R&Z-s=m!>R{oDmE&aEByHW2hvkQZdZgpF89;pO
zRmY*YeJ)ICIm^wS8if!lB9tOSR2|IJ4?K8}&ikjFbmHjC3G}AwB>mvQX?6?&crxO<
zNORpE#Dj4_RQzG^1j}WAQ<bld3}_9y#04z&;t3&5x0lKsS}koD)9TJ6KvpxbPZ1Rz
zvmt-Of!$NZE-^md-j>&MQu-o{T$qV05d?x?BASqG3tOUWNvct2`C~!$!(Qr6(*kFA
zHCC<b=yb{)!=>4{E_Hgd*9O%5rN=SaqKMg00zTW6Z*@*#a^~b`<4xBy5<TkBUVdhq
zh4}mnaaNGrndeWD+k}|a12rzVQrR}QwT*V4-gUC+pa5TUQqN_FIotw|Hd@nY!UQKB
zFP_RVhNCeHvu;x>lo}Ip8caG7Z8D$-OE3$P|EmtMS;=H*77_!<iDYQ-XKS?zO%zW#
zRgDX1JeHH6PM=(eyE$lj(GF*s+fe$sb!ct)`Ny)HFacOc{w=?}qKZy8E3tiv)=8O`
ztzkOvN%|O_i-(%F)QdT&7}TWA|NPEk%50NBTR6q`Vq8+Ob(zjmEjg}eBglKviH^*&
z*e1m4Gjh#a8Ey%r<QR=9kF}>Ml=nV18>Tg~ZG@LJrA_m?2^|g-PG!~YNi~j{bdV(i
zQ0KuYC;htsQf4E+&EX}EjW?0TIHa|aZ<3Hq`JruzJaea^Ph;yuSm|Bfx4J;3(h}>}
z)bVt81t%4B_ijpF$&$~xDhK3ZpzDLmGvb)-eJG=mfB`@*U{PnSP@eAtVH;DIaX*{3
zj%z+UW(gfbUxVh^@ZgBpeaYP`@k4}UNy$?JzDV+)X@_L?82jwJ#7x{+hqUpe0$C=Z
z5hg1>mPL+b0?3%8gl#V#s|FvR*o%qxDsU9qAjB*GX63k6RpVl5K7d!DSzeGV_<}pm
zt@GSf6hNf#&2%}*t2lJ5ow~)aD<LmR|9xdDQI9jX{KDYr<5=i2Bdqf+vt67U;xwT6
zM}$$!d*f!ir>E~o(6C6|?;D-!_X;=23xXmQg3e25n;hd)Y~;4DJw8%U$o#?Jt80E-
z(qNAd7~Ns$E2Kjbq$3K^vl=^Z>HSbS0?e8WfZxmv4;$U}6r3aUo>v4yDVS%tLfxRN
zEC<iw^ntWNEjeRj7hJcqcPPb|THWkxO{evk38k&foY%iw>QV9y*^M!z(>Imjpa+ih
zHEFaH+w-?{eYBfx98DXPg5H2r$qb)wnGMW~lW0d<HL>}?HPx?gl-QC|*^8%2W9-C%
z>}^l`y?IYzf-qIN0FS(k*UkdhX-Ai?*b>f|V!igwA3xqGFi<j6QR-C1-J!uasYM^w
zuw`2eG-RIUJTQ)EinUItH8NG!;2ys(=)4odCX8?m+t+x==B2MZ-x_nzbp&@yKKE(8
zH5J~J=2KQ|fh2!TmOtKyJo9JgS{gqAM`gDkt3ne<Sh|vxxK$_PUn-_ir)KFV&y_lY
zX}-4Ul<jO@O{DY9U`N{s88jwNCx2F3_5VvgOj|3)R1ek9v(#0T;J7T3GstMu9c&|>
zdU;;-)<7REnYADJ=3*xKG$Qv0oTF_roE5Uo-A<Iukhtq_l~Nzyn%sEq4rIXrnWrxZ
z?_(MYB_a<CUJQp6z%srb)*3e)e-50uXGay}KX)hHAXlqfO*z~Dg?Ad+bD<vG#_&b;
zQEN#)PRWt}xO$2Jx0(@oI!wlLFC8UAL-ai4<z^CTopkl6tu;=Dt+T}{TRo|AG@k0&
zwfc?Ae5GXDgc6Y!IH7^(1t1s&FxOw^UF;_lOuUTQsb*5MtG8I|gd_mPVY<Isv>Hh3
zb^Oj6%`dpjJt{s}Absi4{_!lha7Kw<y&qnkiR98w!Zae|>w#gYww1Ja=3y?zlA9M;
zxnNJlGGv6h(^@zrfjZwk@yApWSitocor||S5TQnN?~|wZ#a-s%H<kk`PU(NB^H^2g
zQB50$6VtDk#97PmOB%{FW$fO1>(#HC3yG-1kj&8wB6Lq+NKsOJ0+)YG+WRJp-K*O1
zC%%xt1wzlQrzh&Wb;KGw_mE!j`OD-T!(OamxwXwDg3vAwAKjt+DJgF3fZ}QCI@baZ
z`_Rp$4BS3!0uv1e(hA^LVwq-!T&Qr_yfG=iMa%T8F{w~?ZrKjez02Tb_RzpXq4SSh
z(+;C>2=PJ6{@SS62$s-Y*R1$LW`yAlL<C!7L7Bj0hE|M2AlFnz*?Y`1{6#a8b8{gh
z@I9jm2wh?~`vc%{U2XAqlk|m9NZz`<T*(xp{GPr9uZadW9-vx8piw;KKb2oAs#<<B
zF0Q*Ix|c}<&NVDa*UeM;C?$qNXaZ{Txkh3+wH>rY%%hb|mzg|OuVd9iV#;r5M_eP%
zZ|_mcLByAcQmDB=Q^lmqhUJCt$6hW%vgu5udi<|J`K&lp(V1fh4E)OV4(#mmol)ai
z1icskR$@~Qz#~5<e{f;)JGK6`nWY36F{Yc_gyd2e#1LA>_7A32VqE{hVi`8krC9Xt
zpD|_C!2W!ysPLHMjWqZ6kyNGs{$m@@(-e=^#P)4gxs?Qwivpzdvq@KBX%k!B(z0&K
zL)RT?z+M5_mnyoLb1eQ)84VhuzeayAcHEJIXbJ~t*l!wqCoXNUI@ooXZvDJou`KI>
z8ssnNcV`G%(@ORr*bA_V4pg`n7lc{XuX!!o=f}a*hY%^WdPbCvcaBmT4?hatviV=i
zpWl5)!&QD7Ny>e32lvbT>V^!9GD3I~NNHi8G?TOnwxHCQ=q6e+oP{cab2Tt_j<4S|
z?Eo(gdcH76PdyIV0%p9T!!DZH#=7|LBUCv`Mdx2;)4Zl3%1PFf=CFJ1p5ovq$n|O#
zIoJs~DcJ8;;;(7Z8Z5G_)h%Z6nn>7ehkNebSY-cdvuU{9PX&i3_%`mX|L}<Nt@l2B
zid$P3L^^e+^J=?RjM7Z8We?B9J?n459VW2dB{F0w)>&jHq)WnA&r=<tdRXt_#bJLQ
z$v{ZS4_+O<qTj_{xzbF=M_g_-F_tZ2n8Zbvul3~wUVML02Z)-ICpx#pTL;OM@=gxp
zHK%N^4Npa~_8H<U;*<R*G+DlXMM*Y{d;P2-!kiTgfnTRn=CGJvZzLE<agi}u=K*=1
zYA`7b(Y^Gx&}~}%_A-O(7J+`7f!-g<8S*{nvxzL8#!dc|fiC*j<NPvS7lC7zxxt;7
zRDH1>uu@YB(zkZ5FtgJ8@Z`!&<IyY6iu%O7^-(E!$bJT>%+5L;H#IsvD%yTYSc0nR
zjXP+5rh%3xWrTUw!!<v$^xjWb4zM$8rfC+PB*OwLd3{cov=1t`+sN!uWAL{gkr%VZ
z$f|W(pcn)BC@$qV<y(7Gd(Kf-hY&W(OTc0M7TH%8<Mp_YK-c>5(^v``nswZJ<rAML
z<Mp*Qx0DgT{_ax?Md|dsx4Ab|CcP0PFiq1OvnS)rjaX1Jl}mh6cy;6#3LM8uE9P4V
z7M}cdtf#x#_agel1F<0Y{kbq{dYR}lU}rqAMiL{0Y_4C-q)J7YsmN56KGoD*DxqAn
z&}C275?$w?IZG55TGyn8<=R6hQH@4;yYTaWZMVxQc(*?V3YM}=vwn(A=PIkZ@o07|
zYpKEgRVp3yeqD;`r{tZj18law&i#C5%%_-9Vjkr_9DWWmDsv|8;{S;J=H6=u7!lF0
z7*3^ZL{5lb_Y4~-{qcIT=&`fg!?)SZV1i|fnb2;`zAW6@rI5Cf(zTk*S{6w?4iNug
zd&EktuI_;7uudZlWqYEf%p&9Hy*C5J{f)nXeU0;tSE0Xhj#JmW4ba~`tr&INm8=}U
zc7gp?QkYfXI`Awk)Kt;#YiNn-a;ho5Bo|}4`)z-@6i3N+QSHMc(n=HR8klbHw*@sX
z^0(ej{E2~RWc+t}H8`(bvK?wreLNvg{?Q6N_dCmN?Ax-{gBysQ?s^g|KvlU_h=4+*
zm}V~A>$5f3^uQC}f%rJD&hIc?4br8Hso6_Tj9W1fV0HCCZJNo5bD|G&A6jk4{d)tt
z7uCHk((N^Pu-OkL_^7!Fb`qv^m*U*2eFQSJ4#JrE7o@wiD|e$htqPVqr{(o(i{~JQ
zfh__kI>JG>!hyL1$UBgyz>ViLb#<E$1p1KZP$p++eZ~iz+x5;W_dd>_e<Z44G_Mc3
z_jbexVGkvVH>v~l@J?T*{(B_$QMy89Ep5;SuMwgNw?XK@%^Bupx>~LQ+CXAk(KW0S
zs_hlfgUGj-@iD7K@THFq{WAvPsF8Lp7(s)y-%*dY%78f?b&=^Gf!b3v?3qTBOE)jl
z@i>ROdcZ}g;eN59@`;$$5fldMpkF`+xvptGY1WZbX8OT!soS(Jh4^V*nhk8AC?FX7
zq;dR`s8|nMv{3rH@@VoqXjdhL|6oqJ=KLJBpO9GD2Dx!}?K+@!BSKYh;BSnvj)8Oa
z@+vDsw!Xrx;h%BJnKEx@;7p>GgCDCG-F4=GUW=4V{$m7+AyBO5&~KsbQjcQ%RKwr+
zw(*6}#?nHI%a4db*Y)3F)$o!?yHdKGflQLg!HkFE{RZ)Jv!nu)xn_3mu}x*^l@{^=
z7j!QuVMIGdbaUHWnO<QuL$<YUU|{jC7DF7grMglFj={_Su{La$N+MT-n~K-%Tj>t~
z1lq3R*|TM9uA)Ee+B<G}w)11x9=(%VYKs+SNqEyZxQ_y}uE@Qq1l+JEn%V@r=bUnL
z37d@cIvGr!5m0Brjl+GcjU;HN;1uXlpX&z```V|ob8~5iJ#wS#Yv1o3{|SDpklEkO
z+wu8lqC}Ssv(c;gC|Omclf8Xi<Xr@WpJSBj_IwM-n<TLnC0LMSm!9GYb<u1;nzoNB
zF5Iz--mx2OH)!CA<y?A4Omn#~G>fn&E`R;?5Fjt&mqb(h$H)#>hS@KEkeIL^gZA*W
zkxG51$epddwEX<!2BUuTSp8$}bgDRNwp!G72nTW54DQm<)@299D3~NnHPCp*uiA}?
z;cXy~`Sr8aIh174O&IU?qd+yn8ft$5v2Jd0R*!ZLA_g7D2amlE7=LgMat3YB$O4P^
zC`h<e7Q_eq_L3V_=FNS>R22$+%+M3z<dY7>pV*U@`RRb{tB7`c&1^)9YrQWeNde-g
zn=G_(>x{;JMi+B@R+xbEl>oG<r()i=kOik&g+p<h%?RdW)pYTMsP)RVGUNQfKFeBY
z$(?5M$mKULSAQmn+!M50b+!I0pD5hH-LOln+*#&zfES2L;Q0Zy@?*cHd!dyoLWsiZ
z)STGBJ`9MRv&AvR3Ow!h_*a{IFO9xg0$))4qb=c%B{p0C&hh@DkSr!e4R&ubcxmHf
zca;ZN0hNVuJAP_8=0R;oJa8E>Wz}w1@-MDC2cF>1ynj6`k)Zd;;y?}$s^ubLkCa_a
zCb9muRQZZSvPxQn$s=LzhI#7Y%T8;~8t)K8!ZFY~95AetGn@k_$%$Nh(l+{sf`Ml0
zan{SIMK)+_Wv_4f3vS2=3&s^2qVS{xH5p<qBFb}fS#J`a5{gs)lpvUbzmzW&ch->n
zEDU*n2MYMoLLDZ2Gq9f};K4R|ep7dOezoQVb?aRA*b<j!t`yUCr#hNi-G^u7bYRXB
zg#yptDYW<_JY1or!Z7;K7Fo-Og5<N~QZc!RhsU27XNfQV=?xK++#Ev>F3v7hIkc7L
zkLAeuM*?V<acAF}bYyncC3iL6GCv<vd>U$-KKnPK96mUge~MBLbD~0aOzN3vs8hA^
zHh(!}sZ^YG{j=7+e4w9<>Zq~Ll{?m-x_R7jer8y!UA@HtkS_{<5uyg9*`*#U9%D`I
z!0uiIdb}Q53i4Z}ChF&C{tJZ=5{fZR{UzfIvwFsS*@5;C2`r~!2Lq|^b4i#TeOm_u
zOd+S%>Bw|tTPaVj(N?@3?&GI9jrAu@ad*M_@vmxpdbKwS;18n+O9%2Js728wuV1V5
z$-EH#ckSSE=k}p>uUCNi<L>hWGZu%{`3B0N@^pu+cRe#++>6&g^ucLvGd5g7Kgq#g
z9>@||_|zO#6y{0%O7DJcKh;m8N?c4z1GRN<POVigME;ya#hdMhdltrzxNt;TERs!Y
z)I`Qq@!<&<j!k8rd2Y_&^o7&R=M;2dPlU7T3CuIc?dEpZX{7)gd$ahj8}!m8t8~)5
zZ8iR0!3+8aT;?iMMcNsl)_UY+{w&&1)zz<0$_&J&p(G0K+M{n-Z=P)x2U;$%o$Bp=
z&*#G+51Sjk2^9c?I;j=m@0qD02Bp6g-#<go*=>oU_Iq-hIrk7WEB^fg9&MC|NCJ0o
zkL#NEyQIj)>1y^$lK^^+OQn+e9;D}mY=K|o>Y9k$wL+{{{<6<#L<{573ihPdRhgt_
zVKu;oi8avetsLV*ukOsf(Xb1s!$AgCdFrkGO`CZ(R16il1>(=p(0Jb#Yy-Hty5ezM
z=0MSYa&0Fu7pZR+@B(G)i~?V1i(XA=$_Q87^JKHd{iL&if`{b>5#u=_bO)gZlBveu
zhpH94)`JSU+c`(6u)DblibiMVx1*iq0IDh}vsPQ~9ZeNjyR*@wWN=y&{U6kI*%C1S
z@qwC<rq*DZs#@oCC{~2jMYlz-M&-f|V;|35{ukDv266Us*&4R)S_-d8^yFosNx{81
z#Z9X#45EQ`qUs)R7F-vM{n+Fjo2n}AZ(!JAC-Gv$=P}Z5exm<9HSm|Fqk-bOIj{YZ
zmuc@eW>#;x{te;7a+5zKrMo>F`quvwP7~(DxW6oL5SbR|1ZFqsVWp<Y`j&W^m6@K>
zGboH>i%}fP{}>Wbp4o%fq3U)ls?g5JA@VFXn0If&(e~i^(YW*rtxS$%Wx9r+&qL-@
z^cX-VoC~lwc-22Ff7oR1(hUIj?apRrFA58w&uiBV?22xQ{s=M&1lQfiHdW-r>YP>;
z9*(d6^4jG%Yl=4AmL<`4oqAtBeOn7PW^(#sm}81&m+41Pc)!w!0qavR=)`Wgnh(=w
z){eW-Ymt!YE3&z{8RuqYWhMB|QTW3mtxrhHZ0pa}<(>><Tf`%<NDGm%6R}F8n3D)O
zn~hEqk(iihgpi@OfG{m$yCA)mt5EXIq?^sXJXFs^spg%4cqv;=ll!8Y=+6Bv+t-`?
zED%T=+=h>SB|*g)>EcP!&#a8%FEIkKmB<nn9^wBLJJpAN&+YOEu1KmAV*zO2-x`Ag
zaIcu#;`!`l&Vm`1{@FH|yG<+fO5cpF4TEJqY)UB)1>{{ow?=jh1Ce%#Fg}c{qSSMD
zP<Rb#{}`5!kc*nTeV3QS8)ilEfl1fz%VQtkY-P}M#X9>+4;OK@9=}q(<OAI@1cE8$
zZrj#hNy&Vgnv;w0o8Bpgg#a9%_0>2YBmzHS+}bs$KU5^7JiPTDb`BQV%|^Bp{sl0u
z<axFnKrJRU9_9KE$QyTDPz&@_bJ=UI<@##%qL);VZ6^!W%U9?xdc!9h5{ic@^(3K9
zs0#yBxrbR8qNv&XMpW~&hLpZPM#ej{J(xt)h^ZNnq~n44DyLOS6F9q*(z}-semH2^
z+)*B7N!hG~?OIc@xNq9Fu!dYgwHL?sKf)p@tdFq#NVme&Oj~H!l#evcSBO;Zah`iv
z9_``IjL5o^S+wj*uQU(cj7$qKCnv9+`RMd@rV`|gRoZVo?38n~WTo8LD=@sSsDTTl
z?Ud2qsMqr$9=X9wfP^~{%6eYanaGFUX;BYLe{v7YuR#B?1;E#L^I?ltZ>-{wnqac@
zo)g*f{Y&$|sx_i{hrOz?OH+k+bLZ_(793E)TPKGgEr+GU0*3bZMxUc!Uz3^(lXJ(g
z^G?k8-qQBGoZ;DQnfhmNQZpBRF8plF9^MvuHF2(_A`-h{3V_B|f4|29eY@YklO>&g
zubrzHo5Z!PFTuIwfN1eO-D<#qXDuj%wy|YhIbJ3VW98dneGDqaxoCL-e_*y8c1mC?
zSmX=&t-NLBv<l5i5Um_$Q$h*U93#?ma~)Js9(%cC2A1|Wf(sXOdP8HMR>T^@TA^aB
z_XObkA8Y-5z=O<R#^c&~<A5k#XQlkal3I!qmm5Xp$T-=Aqf~@6A18O?r^FSSv9i%C
zZpK!q^&u9^*8WKG&=j|$r^!XJlURK{@JAW>x)S4xU2g~+TcW?dSQ8Ob4@BkYr#&}Q
z5M}flJUAZ2Mwx=L3FdF96&WM3Pvmb82!Y_c2OC`A@}J0Ucl!hVvVXgM^U5^di`w*b
zRJgh3Gw)ghshq@1Z_>(_$G678jtC0D>L&WkIXc~jjgJQxE?bq6&!?m-jaBdYx`haw
z$_Oc+NyYNYW%|IeI4$|q)UJy`?n3m@2gDkqlTb{J2Y&pwyYDwNpGxs>HRin{Gj%i@
z?BE~<3jW9i<b5Q)mMAuIbZW)iuKpF37O>p00t$GB_8=pGznsNfXT;hJG+AC@m+1Km
zO06o+9qMBg9_X)j#l!o_vw+iz_y}$=3}D%ky&-*t9`@;3xXg-w7^;kiM3|pl$Xu=H
z-qc$e#TsN^{n@kLlaabU1z&sD=k~@p#fSha2;X&Lz9OD=A%uSldy$`9>2ULd(B)wH
z*I<X~z@0*!>k5C*+ql?f&1UV@>i3s}=z)w`gw5#&1$ST!WdJ8>5_Yr?^fZE+|8iR?
zMbIHNM?`oFYPWf9pOe0q<=iB>6$x(v9_|aaT0IXleFt+)M9eo*ir3jVY=Un((t$;T
zi#E>fPiN>Av@z#%=w!sz%=l~HmB$1YB3sV=BiZ|s@pDe-n8FI*U}B8uk}rWeELW_%
z&<(}He`7kT*g&@>Vd0(3Qt-w_$I-(d80Z#elm|x{G3duvK6D<(=|TAtH7CqpxkONJ
zZT16Oa|`5e`HhP32f3*;jg5_gmNWkWNKi2DV_zaMrVLA+nHy&ecS|G<vLih-UoF>c
zBvDV~Om$s%oS_2^Azw=&+sq4`8w5ol7&hWt=%DklOR<il;R0MsA$225lRMF&MK)!L
z_>(37oDK5$a{j7yGtksd3va>RKN!oPRm(g?x!y>>^N$uC;wUMeJ^<tgmI{*Mw|BBS
zcDaUYGR~uKRd}<0XYsIpT>yW|MtT6dz(dDU7}8of^G%Gwq#U=GfqDu9y_x90&7aYm
znJzmR9uBXkytH6PmM$BdCH`(VOPujm&Rwg<#8$*HrkwLPW;|*zh?^h(fq($ve@mk0
zzU`eL$1cEyiQmKhoeXv$+MREH>UdNtb-dR8khM@j{L5gKxc=@i`Ioi!_7T=6*X7o`
zzVj?i#c;^+kNzs$K5j|0$ERGa%Y(U|4wh1uM0#jrfdbH?rz<sR6+OpR%BUq-sd+g5
z@Moy`^?T?L0(B}nd?N!O#AKd;+D|>=ivQ$TvC`n8t?~cw{^<9hTcA_CAn2sQv<rlO
Ns48kHRLDVs{|_1Odr1HQ

delta 15835
zcmXY21yqym+aDl}(jnbQjs}sCk<uN~Ez$x?jfd{;4uR1f0@5KMAl)gQlB46>`#;~#
zo}IJ%Jh9zzUB9^QC+Lw+oCsi7!8qW)_RM66f`k+3_P!Tl`d;y^Gv#1IbJLp(<DkDr
zOeSpvK}BDg1~876x2rJXf|?U*EZ<m$y!&Q@oPis;Dv<J`x!R7!pJtgDQ}QD;Ov>0S
z@O4CkOizQqbZtK|N8bx+MtU3uo`k$}v(~$usw$gra0}}{C*NIcS`W2=nM=3l-RV*}
z6u*j^{h&hS<X^Hgt#ggl2LJNIL@$rkaF5borK=S4hWuSnRNv41BO%!Sbc+gNE$Y)X
z29~_*#N7uf@gQ&B1!t)g>zSB<i*iS;=jZ3uSQayPZsIxHo~wQ;*siwtQju02?QLsR
zxYr~V?P?CJx*22Rgi0v^%!HaP-B#}o%*B3iE-ZBr!cYs7z6fTb7Mqxu3|MqR-wHqO
zk5To1>$u2Xzm&M(lL*}H{3<5=2+eKAmWvU`%X&Ka;~ISE@DkK<ez)Xdai!qQoS8|J
z@bf2-W7E*l@oMTrp-}KKTK>KAM)FB6c3QY0$j4;s?oI?Y#VRNW2r^zdwwWT;&ZGDd
ze04=F(n7W#722WK5`@jUA9cE2=Fl#wu3pO*@n%|clgZC{QsbbdDKXE|bccP{Yw+&*
zI7cimSppid=G%-Wb>+J{`=#8S8nYTW0PZBq`U+i1ONsEKJqiA+hcUf6WXg^4ft@eD
zz6i54Rd+8bj{HSEaM?RBy$LnaHPw&T*jaKGK57+lps)FsxM+NzXU^CFm1Ry0AO5Lf
z8#F9cuE_kIAPsna&8udZj>Qp-J}Vc57pE}^Lrf8~`8J}z!n4@SiI~J(Q3DoH1Dg<!
z?oA}#_!{&SGA|@{d;>a&qml{voXcTtw`rUZLo$oBC`~dT`wA`4j}7hGC-orDd#U#?
zUYXKlgJEgp_YVmkrcLt%(Tc%^`XnX0GNQG{-niiyw^3F6$;T{-;c7ia8Q}{+Y4OF@
zvDXRXumM|jq}wXSN4cx6$$06mDx;qvc5_uTDi?p?r~l@}3xsHNmHI@aFayt>-SSWS
zIul+jp$AF=f4#?$Z#{iEjBQIfO$TD_--4qy<(fdvVCv+Z0BFgJ7@CDI)F%mlozsMf
zwF%8-WGWm9d1VNv1$L^iT1j_~-;A#+E{#*b#2ZnMdXlMJ9tKlpW;&d$<UsGs_{F4^
zm<gc|6Fv>qcpBJS;CJqsaUGkI^l|-JjJ9>9QrewBSYD1Aa%C}M%9`Tag%K&smxf2)
zC19DP$oTD{(uoxuX9vBq6flb%TbLxTiDB2EN6VY*Wu@+XFh6}iJAP(PTniUOTYKQA
zmOYR9jY1r7^P(N6wzif|w+qE7n+RDJEc`gk(_Z}b?pc9!)LFRCL-Z8^U1C_tyy2i0
zy$K~S<~PW-_yDy>6E}a6wzzl2)3bF`%l*<g`q9xnmc<(9wO>0dtDEl?eq0&#cRtl)
z5pG^l?+-ao%M&F^?9)tXXHwU)MY$@)=N+nPHq(2EiHLX`wmjH7-<7``BfcskN8f4X
zHZ<|rPi1RbcU@vRTQ5EB4o@6ntoIaId;%65?U?T0XXTbxf!fb#Iti@Gm$dM#GNTXg
zE8M1ZYixPPTH$AlxlhaL4~wxrHP$>U_<WoyMi;gFtjG(NTR)6}h0Jb;Z$3B>40}gk
z3^y*u5$ZJC%UavA567#yi04_A<XLVoG(a1V?7m>UpAk&|eBo~UtRZ9Y%P&de7l1L}
z`P}LBZGn<=Ws@gyxEv$xp9^!ifBrJgbY^HxTk%!0#Vgz#ua8+v;;${82y$Dm1Uxal
zAsYQ8Vl_58et(_yn&p0Nx^w`d)Zgd}OU+GT*R@6)jVkXg6S>mcBgUsbK`jjf#JHK6
z)O*D*8}kh3sw4{wtpGcYVJ-T%*?<Z*VTtmRn+WPijxp!GeN^hS3HrIY{6b1=+dPUl
zOyX#imL+khGW-L5qpV(6WBK*JuZsn(IEgJ6@HU@b5Mm;HcNMEa1V@#7#88OLp=hqP
z6V$4ya`bzdcC;RjuQF*r>E;5wgH8GHE)Ne$F|2$t2Ymm@7VWuW0*)ErqVy`gYNety
ztrIpt(t^40R-sMYbB*DTTa!RF1l82zO2hdFFL5my&tXKh_;ca)!$d<0yvsg_gT;cf
zd|S^TlBWRI#DygW18PY><5?e{fIW{Gjf!C}4kqco@1k`~QUqiCmPt^_!D#}4a?gYB
zc{wRRY;vD!CJ%YnMcjdC-cQ*AAdjodUZYvF(tKBXUA4Xvk5Z(8DtHH|SGhTgJ%vB0
zRA|ksofsA#2W`4+SSS%<YQb#jt0)Oe?;B31&TuZ>De$_%0Lu_cPv3^OkO;&d$Y_3f
zSt9Ym|E%7e-kKOZP!TwJiwK)#KlpM{yD!l;;S}$xn;mV&$pKJp%PpNTT^*9W*rXzt
zx%gSc-N+@f2`ZAoq+O4E^6ED#M~Gk$_*4nyK`|(6)Y=0+qq{5iQ=ngQ0cmE(j`uhb
zl4P!jk~d~&$@adTb5iSt8a0FL<a7pPM($tRg-YAqL3!|wr1lxI&KQaTBikR*55Ffp
zOz95w7g8eAM*(Xx2{)(l_c~M6kpv8H2Ml!SjobewUW*Y3#La|!7GygJBb@@ja$0d}
zYsPh20mE6WfAni$q<t<6s<7Gqh&v)AKhr=>Moi!9L7t&<3=Y?gfVY{?Iq+7Zlkf@8
z%qW#C*%w|a?doPE$Q$|UkYE28?7`Oi4ex?%aO5BQ#{>QWx8j+*#OGavq()1GSh<|t
zZVWorIg**t&`&aM#{NW?o?_g*1Z%VQTQhIcg4a)HA2lj-ytejGf-QbyC-VA;)#xc5
z`f~>RA-UpXeXt?SWu8O9CgXK^BRGb`L~XRhw?YW#CYlr2e}^`Ya?Q?aN=L2cw@bK~
zxqFvTJ`c=g5bj{zmFtw$^R9TGDFJc%qI#g<8HRvhHaDN|%7cp}H9lh8``xLY+TKjY
zll4#2fyFsrJwN<{w_QSO5B-A|ZD_#z&KR}V@=ZnL*0pbxiZ#P;-D~A{O)LYLkc9iO
zLC0^$T*Bx6R^AsaUP3V?q=@Xg41IFM9%}@+p@8Fk;ap|K=juN8uGJlftwYcK-__`_
zxw*OQL;rolpI<8*{-rpGanlPP5eS67$m>8^^K4qtl3a_;07{?0c+sQ59G8MudFZ?>
z7javr+;LO;4K<~^hb?VytWH>a4#Z^UDcV_Btx8wR{@sa7iR)CmaFflqeJF3=bxmV)
zS_bxPnu=U}n1(ULI#;!&_OIoh(dW&%$+m2V4r%3I-;!8#?v;2~U@EOTn|-i_+sm|i
z>fo93TcV5(p~Bqw4%t2Lj>6*@!>@yVBoc?D<8~Dy#)-L;)Y5$|4<gbe$-IYt{R;Vn
zl{nXay4iIXrZk?FWXUrZq-{r7>K*nu#u9j8&YM11F{C$t!X^X*1y+Kc4qX~=zMBhE
zZmf3)lEn@*_UUr6_a*74gnC`Zkf|zR(Cy2f<8|<h^}jJDMjKXOwMz1s`J@v{jz;Qy
zy57Br5@gZOe&JluW;7#RuGg<(hGd7Q+!yt)^T44nlS_@x)=OIBEMwHV;WbHecQ+7-
z9{udzu#^2HmfRs^;_56+$*dpWO=qlw&mtB}&-lQwy;?VkM6ZK|>4E(zEx<2bMFhN?
z`QkD1Pv^tY9n#9BwS{~}&N@-`nTLH=<mX|z(Fr0*NvPKgZA32;RT<3KHwu^_-~#Q&
zn?W5fnsaCTZBL`0Uq{(8ka8ts27t|gPd3#S9oNiWjPQ%i9!3wHzpkjKD@F3G^*lPi
zj+d`K*f0wmTLnQ+yy+VGZ><+jDDTl!aSKnpk3nxUM-?(Z&%O|}JwMURt_}lv?0a*=
zBf7t!y#5`Zv&rN=B~XC6-oEEa`#||364kWxRP2^?6*p9B>H2`6TBF_G9TTWXl|U(W
zdFjn$h;%i{8>g+XfQvL`Qa;)cOKAWzBa%guk`_gKuYJZg&!%*Ozj_%i-i>JfjLmA$
zxnnNTx%i1=BqPn)<IvYDyY(F0eiH2G9zJ}pk!eRH-Y#r}48#23=tS|;oPc{+Mvs79
zL*;MdlQCDkpRG`|FJG{lFd#%6N-bQC^dc;Q3xfH}1vOkx`HU@TD$g%jdhqgbu?khM
z3iD$}IG5bLQ1px@FJ__{w}o%~{n37xu`YBl*z~*^Yha52Qx7=-JH!k-;FV>iKB+-=
z)OP;r+pxP4!P-;e?~$>`=n4X0<xEzw?6N|qrq)XyJj&n<#n+2cGQjKwL2EmBy(}kc
zGhHvo1jS2fy2fO_inLaUbn<nLDo=AF&s3MivSo@BgX-%an1RO=HiBlS%DBAAQ}E3h
zl8iX!l0_xuiPkH$J#g+6#i@s`%84DO7<Wjxxvf_H*rC7G_(SSW8=q1tQHDB~{U{89
z?mo95A=p4+Yr51S5buRJ*Gyys8a}&ukfAb%VnGI@m?fwfKm|2BTd|a_BhLRm`EGFT
zVv?pDCh__BY#5BlvQz*2;_xuuJ`3-<6!DCy#!@)CHRO(tQ)SW+bNMd{yhKAeA@m>;
z2UnGL)e}_zhvGZbr#rw@?E}KueT>G;AvWM(paPcXMW?%{Ss<p(v)P3#^b3-h*iw$u
z@+qU|iwJBe_wexWLE4g;+>29NUo+-Ux+wIHpW6F~Crccf5gP50H!L4Jut}?~;Yz!2
zM{()l=a(+(T&`Pn&X;UfPFgM7%{air`);~})=Qy{4170E)mojE7Lx|s{7UbP!=D@i
z%)y|+t$T1@s^S{IA{mJx_Js!?PeUH#w2sfg=Ur*e$hwb%6S)^;3UhWF^?pSKmkjx<
zcF($yzJnmSd6YwN{u!7p@1W5(Hvp@|%VDutGt9pfo_YyY5+ynN`1;czgp`p+5I0JO
zBWu37z-yxkn>bXY&As!|(|GetucQX>&#<;!EN*VS$P!L?Y%Xt8zIXeA^zH|A@(!aE
zf!^9_V$78KB1jw6>3?kyhg2?ndiSiI8SMw9F4A%Q;AZH`tW3X6_`4Bt>P(QC=;^%X
zY!C!PfP78!ct+Oq<3ZNJv+fK3qtwJ@(e7G;tFAKqcloWKAIc7!Nv)2%HC2H~#Fa(W
z-i!6fQoDPBI;<wpry<ek@CADv@`lgmi1A%6d{unj*h5V=MUJ2cL-yj9)3Qeglg03^
zDEK&XF8kk*;EHEUKlD0Ybw+Qlt(~1v4J+dQWxfX7hMC+Dso4v*h0L6+&H6cK@nxoq
zFW!g!u)>WyHFg)rG`Hyv!1S($TxReyIio`<tKr<L-*MLI%ik3*U~)aTBwwb1TdACc
z1|noMjy^9_oGGl{zs`lmhyjlm+s^7WxZbs``X{=pOd~(|NW{m<dRgmqta0H_?MZz%
z>(-w7l6BaHZAyI37v^2!k-mDUcE;OYEvdyZMIm~HX(*4DqZIoNVDnnmzFZ%XVdZ4k
z#rb3ChUQprBb#!>7N&Rb{tSYeQ$(r2rgYHGr2~U1Nz{ZVJ9H{n5QOWoBR9dK*1R6A
z44;1q9cbP7G_9M2M@L6rfVk#y25?vG0IfTz>xiLni|AGEve#|TO$H#4QyZKMG)O*b
zAn-al1|{*6Fd7NK#sQf}IpWD7>vdCJ#rAxpSSt~e7ci}?SUn$S=uGMCI861gSAF_f
zrvHJ-5N7d7zRz4*_IJKpxSl40zkf*eE|uSucrmgOhdqw~1|g$?U(7On`;u&j2@e?*
z+RBtT&3h0@tl+P+@OOXjN3m@LTQ5NLT<oWHV_@wY7O>exvJhC-drQi-S)VKZaq*kv
zk(*{dlN4cfGU17!I=$@L&q;Rtf)mYY2FtfJcTzg;#>__HwUdTola02=Z%%R6lP1sB
zXGd1|8`F@lYI~_Jf9oFA3G{a;JWu$clTZ{RFiaUwRh;!F^Ronw030jU7Zoh>xz2F)
zt^>3^BLFe2`}vi@B>a>)?UwD~h68s|1g?+38lHLEN|1y0*>~KcJc>wC3;I&Obe+$q
zm8;H<_l(ReF_IW`%1c{)JjSsV`m);69QCi$V`lKdlZyKDdTnHcteJ5GNLfD^?>Q(p
zyHbK6gkI_yaivGZ0-4c~cx<L#(seU$xJgT_08-XpNY{c_0r-BJTkSKNXdqTA)^@y}
z4DlrUg;Ij1q2(rG<97DCNg<fPS-L5f;(h}a3ZZ!$=k{rmgjIWUDmF>=pV#?sWNA<2
zyvzeVkh)4MiqsTLP<tbYCL8I4I|QHcyIP)nSA%>G;i+dAG><mg2ZN+`@n!9`?yqM)
z0M!|B3d<#A8r_=rKgov1JX{_XKGHDSDH*zMqfdPisq&&)Z8iBNswZ6w`zo@dc*h&n
zr2j=)@Tk|LqWg;+1}Tq)2zeT*ISy-R@ug||qDesxPA~V+Yt(<P$2P4@pSD9qUABJX
zVjd=ZeVZL8(4s^^h4fsNG_aO@ZkICJm<6afa2)!h0+_HdnpR5H6|iVODg%=3(!tg+
z2PH$=$xJ+JZPFLZ2`q~{`9*ydInH9kZEB6t0j0cGEA)K>%KNLy1SbmN20`+xik=88
z>9by2jHS#+tc3fzTUA1Ws=leVHb3SzwJ{qvK2CcR&HYG`o{8ywUA!L=Ww9Z#EU@sL
zXDm<Gr}A~}us!abJNx90p*%v|sxPLA`KYpsfFJ+GG(1Syx1xtdPKeKPEj8I{^7-Kp
zj5ACrae}llqlWgYX(`NcQAh`iarfbzYVp)$@4Hvjq9r<u&WkoZ1;%pd5_U_PNCgrQ
zMhX({UkLcH<~ZzLqQqqi!N38~P$)$`xCfmrEEqcfCiyM23DX5>cM-(RNq7@77=!S+
z;R`c|dPof0*iz&d$Yw}af6n#0(un06!BQFd4PqHT6#wf=E^iR8Vj?AR=XWcas>oc4
zlX%Ceef~Ewu-}Cg4%LUdY_qEd9n{wu6yFHY>qjjLGY?<KyB{0fN&}*qbxmSZT-ab!
zeSt4$3HWv!>_`YHFIahdyIu$rk6*Ir-uy`FV2uSyN>9IvpU!_x4T*neCB%>SxNaO7
zZA4~oqEhM{aZIQ(O?q)&aPre+g8Z{|dpk_M$G)u}`5Q7JF>Gvdt}#OBHi`sEYM<1?
z{869w#$H}CvwWihP|Bl~OCaW-G)OG;LN<e46~{7%a~9t|MJBwrZI63j&clrfAfB5~
znl~g~Xs^4dr+%PlIH7w20T(`@d{)T)Os;M~BwD5xX0%JKm%2xtbZ9uy(1K2EdLmp6
z;y(8<DG*eZ8|8P;h~q)FbTFT-kRlD5c28n?Wue7ZG>`;1)^%mFbcQGSDHl&^h!CrO
zL`5p7mJ;;hf?rGLMQz&-$i-ADH)Ae{tM77bJaH8{!8K*nnr-RDO`r0o-}vaM7*iCS
z{e(!6a!F3cE*u$=Dvg0lxWsC-Un0`=zL5SpI)_gQS22Nm`2O(BSn+=2=xWlhly3|)
zC1|2i-w6S|u4!en&&VR;rqvQ!b0w~YP93f!52&XtHakIKb8l2Be}!#HK!pB=nHDBZ
z3MX|nT5VR|Fn`I5)Em5=^riH9e$A}c=0}S}fiyq2gI?0R*m9ic`Qrg4R*cwc#LmA(
z{jg$RipA%R!}+5Pne?k&JP0L*{MUky+9LG*Uqqq+s;d+-*y|Vae$}$njkTOce8R4^
zSECYdT`Ce*5NSzCh0;PO(ah^Nxmx>&$*+Xx*@tt1lkEsq_k1pqaDZFb6@N4IUo@K?
zLa2y3ZBe1crtRgI7Ej)*oHL2xZ99&M6?lxp0(n!<zniPx>`Bh1%|rmYFZh{R!f32a
z;`hLQf%?_1Ni*feZB%8S;Gft?xgW1SfNr9*Q}v|Nix~G4TMpMFijPes{IGSu(iRcX
zEd{f`o9{G^(*CumD~S>BWOT7NOLu#-O?rknT<PpGj~4t0{2Ihqxcf-py_DsB7)YDl
zM3WsAmyk=hVxJn$L_fURGfyprHlmBUYhV!XXRDRw;KlPaLlYyi*kqU77akeeHxj!O
z5&ROQU;f5vDBKoTKNgonN4b1X>Q0Y5Kd@WVw#db+LyFTixvv_@$aOo?s)26p7VN`a
zOw@P(TMx4)y?Flni^g)-g%DAm!0Q=r)jXD<DC&8|Wsn1~9{dTyh4n=hgyhEs6lmVp
zL-+T@CUR0$<Xz8&z8Vvlh<K^?fBcs(E&t!;>{lIWYF-Sck*}fw0XlQmK9*pN*1Q}|
zZTyJnWS(+mCv#JO-1R;7rh(Sd>(7iGzOJ&+opC)K?Slwitg)eZxk}d`^!5x~ux({<
z(0rA4LCAizALr{HW^+c#q9`DfpjKo9HAv_lEzn=UAqb<+BmK42bD;FdxuLv4PJ2*h
z+$f#WcVaffDwyd(KEC*w0zRQ;T+WB7+Bgoqw&f^p3Av`|FH#t_>_Nh&OCKveQT4hq
ziWtr5O7yf9{+1|wGC~WK96W2?=-o)pF&dk-)9dmI`%JwU#K1^KV~_(>Q<``ph;y2>
z5@zb~1%0z9Itlofd^QhFWi*PWMJq&bMOJ||mSzE~Ny68XeS5bY`fqQZ!(^)Vk8oAm
z7cv-b1yUCxSpRFKR#{DJ4|qI8cZN5f$S%A=p!>fM*r_hmse#9#Hei{V37M5r8P}8D
zoIKBH{>odujQ_3%F0J2EQM6^f>J<)el`!9|&5v~c8hnhDue`8uRP<FTmyeX)9Qt;@
zY!zCHTkliR;J3fowdE$#e|Oh9V=9<wW?@ml$Q{T>s>uF64dFguA)tY}_hVF<MesB4
z>Bu2G(I0nz<S1YgEkXA!Mc3jXw!c{!<Ycr7H5N;c%eWp`82Mb&(Gj!nrXT|;Lq(C=
zko{~XsobZOCdva2x$B>gCJ0YUvcxN2rU)LR*NL}}D_48|S%o`=i)EaYG|6fl0f)O|
z(ESHWs72xYRUKC=kn!b#Cpe1m!vyZmRf?DPdDl5k-JKXBjj3zW1>qH>U7}%a$b6OM
zbiUb}1@aXNj-_@Kb%tD#0`FQ=J3qm3i!PWgO+;&|#@`XRjj_wfNtGjz-X8V5voKE6
z8pUg;f66aLAVh*xgQ72on0%DSy4~`<jq$0|YTAsgc@BfPb``HAyQ0d4)aYU#XZFZ=
z(v`M6M7fSeU_%~Glxz@39tD;+bUkyyVF-o>yrqss-6=P~=n^Al?VU!_Vx{bU!FN!$
z{s&dbiClq|$ur0NFQDsgAK6M+mI+hF*Bm~;3GGb?^Bm8NM&7FHIS<#H-o=O53u?ux
z>=}01tDPORayg8DJJV>OGyklOB_LocOc@fP`_BQtJK)J6Y@4u_?CZ~}_X=L`NWUbD
z0$|vCF5}Pc5n;x1<sL|i@3Lg5S6kPF1fpR>Cg}6<9K`Rqu5lZ))0VCPm#f~$i^Ur<
zJm-Xm^(SeEiGo@_Nw%8^BILnXgxHRhL-#@VTTU-R>B6o?Ir387{VzW%<gXqM{4CY~
zd1=%~PEt*v{ma{SRmWC>WO;Ku91oz2FDj}ged;)Hz)`Xh%zSHuQP@=O-@wVvm#);N
zOeT<j_aEUUB~WV5im@9EDN~%<D5{)oJr&Yb?8{<V8czr=x*}s22!8XG)=scUe#R_)
z-M?alzJ}=ReY}`!EeX#?k=g|_Vx9+L0|YPAU<62t&fVOK{)Q=J^B;-NfDe+o+fCB>
zC;t7B`}i#$R?no1ga&D3^T_n_>mFucJnP&4xZ&W_)CxAMW&2*Rq4~7DbI3mGf?C8R
zfzHBHaG+Stj!QpTV81fzu2jH&(|g}2PV{5a5VElk<QXyi)J@JcevN*%l#V0gO&k0S
z*ZkDiNrhxfUs)V&T&bmiDf&#BmUHR8+Am;5?A1s_H*!{lxe(SdO-ngIdy2eOTWO1Y
zOB|Hm;%{fbN`xKw&IsrXO2#XZErZ&f*zghj%jVFNDDsUl2wM-V4l%ocEqd_^ak6N%
z?Hv}8->ynYlO(N$JgWOI>67a!eWeroh|rTGUDV2P8#knAbb#VK_cJ9|1y(H>^91B7
zp|KC6i*?{klW|3(_UaG(&}hy~pEX=}B+D(;L*UHPG1at*qp%hIhco+m(+Gw)a$|Iz
zeCehltGOLQ(Qq>gwd#9g%(_!3B)~GkVve*|o_BC>em-%m-}jK#hi#cVEM=g#8rs!m
z8@R-)7WP)S4=A6taq@z=2bP;@8DR#<M4Ekkuc1a%U-JH{z#z0RJdU<?R8U)7+nX-5
zH~$4~{WBNE)ZzGM`EQJi3!bv{5PdU+o?xsE)MlBIs<1}0+<d^%cHX8AGZ@uA7GFoN
ztC_Tp&N7<#jp3;9+N5BUo{s#5CZ<*{skS8<vltU@1rTwaOmOf)fai2Z%8gK?2y;PH
zc|zMFi1?~2jh`&jaId)(kzez<`XX&p|93yk^e}O*r7^;~bgNKQj+Y!nIQ0?#c{7yv
z<3A8o-pc46VF~GX!0(1<bA%{<S7q1tU6M^TYO~Nh3T$@qd$mS5P<g)<cIBCLQ@K*Z
z0}P?ZKa-FCo1Y&45foRNw|+LN5>e=?VpNvj{)=iJN30JEG@SuU|8B^<O@{rQs+ih4
zu&<*THT&4EL=`LNJ_2KUYRdA6d;SMS`v0?~ZBI+zIrg6(F(Keffk`t0&vwUxGyi8y
zpBiyjp0Ae{<Fggw<_L!X=+xe2f5~~M@}4nLQ?hvqOO0TX73Vf=9Q#v!iSYwnSJgCK
zh#OURQ`GC8vtX&u&ds%N6yIq59J93~Bh?uztHjb1<;<7JN@eXm^e<wvY`A4JOmg3Z
zG#<futa4l|+>AdLokK{=ao$MmkfD&&B+0Wf)fIoCc=r;KaX$hYHpJ2u?3PW-{6^gZ
z4f{5k_F&FuWx<Ivu-uByHhML$XcYZRPf95T%(;XCwrGYXe6NDn2t$67IC7+5wha{o
zq9*?!EvdB;t8?FNy3Pskrr$Vf7;&3B9VlEawBA7wK6+(-b<DfpZZqho=y&X9E!3av
zqiVaT^`Ka!<bZ=pnqcy;op3AaEaJ7Z{~TM9e+EwCmSSG*LnQCu#bxbfnH?P+O`T2{
zz3{H~IR6?yc+`+3y*<4E8BW{km?bZM@859`dtpki<6ykmP-}$qe7myKb?KIW=0V8;
zVOwz)9uaDlNSIcxf%O%-ebjI3F-0oJeMAjTnrtZr_^Ys|5olpU=GYw{8y|e<uSCB^
z2p-u~{e`mNo0~>-^s<^gd?KKa%Jv~D@EY;-B0AFAzs{c=#9xK>u3LRA3F{9dZKQb>
znl@^!z9Azq-W`aJ1VYE9#=);H)Uv(8cX~PaLJ>;iR>N8^N+jEx`RiLcB2Pz<qng;z
zme&C%{qjC^(g-gXA(g~wWXNum|Lpr(e;)%DX%wM-FO5E!nR9yx@=lif`)(-Urg8R@
z#odQh>{~==@YqB*Ls4J51+RgRe_n3yx*XfAAepB=Cg4rJ`_b?wU*3Ir8t2vNphA0`
z0!E9R)2-Ut9v!GQwx9*QOA+(P`>+3*;UG}Na{Z4|iZu;2&^JDm-oa#YRku#!2UH^j
zEA$Tn%7gGYM49h_jDAnwe+*`$HvPGeXY8OZ<X_xWlaZNV0|J%|#8TlrSe!E=2t|!D
z6Dd4|H@7y8sr2S!UDZ;vOyR&zn6H}mfxR=C9w9ES{^qxHVwwUp?8xzAVOW!iKv?Tl
z$HcZEbK-}H^MWyd>tQ#=(m9^<$2zn2zvzMf<YVY$vlp7Ze$!B^?j`Js->hW)@F%qD
z+7xgOiP{<Ev2<S5qbWDYcVm`zDT}5pJC&sf$N0D08Dar)a?%QAjt1Bx%$$~Y9TM{|
z6rNRM+0A3_kM8^~qrWk@x*+iaI1zug;S0TwEsCzf>^LT@TYu}u(Cbu~2@zsgP!hp^
z5ZfhD!`yl2yLt(txB)g*`i=3<P2?qsNJy#V9)SSNt!Y#IC)beE-C#?zx~u2Uw3&6b
zA2sB`PU=!i<{=SrGA~noc%<9|blqvod))j7e0KD_HN6h#TK@bT>OBXx3r<clW_7Ag
zD_{u~)EUJkshPc+;gb{7UZ&Y-(NZaM`($SGd5_;#)LV6nif1k+E>4*6U0niq&O?ax
z9YxAc6BdgcU{FspuSA`8mh0Epdi3XDRb_o12eyBtbmooT9c_~M=n8FYVQI=QG8%CA
zIWOV%Eiqsvr@~6s{WKu*Fnjp0C91*&OealeSs4C(`dZy3fVpZR=0O}quS+A&O^iFE
zdKaqKucqARHW7he8#9Z-=V^TBl2}aQx||Hqu=?Z-S#Ds#u;~S>F7h_97k53?)cJ^v
z30OXYmzYM7XH^ZUA$n+wLevcAg0)!qwXKJq={lOxwKiEn{6MiCW_^FJ9f$0IqQab9
zSi77ls=L&EYqHVi2E@zR!JMfmiEemfo>^(kn$P4`Lpe*3V;|=RW$hQdZ?Hog_0Q{o
z)~&&9rhT5!P@PsCWh&IN+wxxIln}!{!_B{1cxyt;%wLbWG_6`2(0{Xkm~MP&7#_fy
z06B%`RF8Y3`2+2>Ir;(ZBRF#s#4HBYo0hyhtGdfUN}=o_cm#oZZ2wvNGquGhuNfw{
zYIU<$%zNS`sB$#IzLmZzk3*_F=%|5<5GY)0b)#HFUuf9cBZ?mo#D9F^p95d!=yw=_
z{wd~^1~w@?q0B>_%loS9Xk4GOYc)FebC*ZN0~Kd1(Bn-WlW(;^j*1LTSJ3iLa;394
zd@srwvY)YDD#W>ca+t34F$a-AcvJS>GGfz9Eyl{#xs?dcy|G85)FX#F-8yZ==G9S}
zSp}E=6TvUE>CDx!v1V(5)9I=2!|<-URIphG#2)7^AO>fOi9c;sdYG2&`NiXVuU$W$
z-eAB9xt)F6g{VD0)e(OKB2BVtoO1J#2RmpV7DW({CfNa_-f6uevG?>shv_sFG-;ot
zf4UdPDd5hoS;uvb#M^B&qCv-FFqK3s7mgX%FB^Izsh<P-YhRZw%YPn}WO5Qe4d0Gl
z$c$TTE>){8`JSEREk##`vsPlc7HUT1H3e{%v0hgtnS5(k_5aXjc<*l6I8>`7@Li>9
z){}wrKJZkTVOYes;*4_f!un2CWGFzQz~Ml}{2l8MKb>tZv(5cc^6@>bDgTpnt{YJw
zLLh^L&;Hc#eI%h1k8k$<Fup6rJCsN2-T<0`VtJMFhI|<M45~jFP^8j)Mh`>^!UKYR
zcmsA=W?w5+&;}}1PAwJAZhpe2`ydY30x$2A2j-T-5S)9mDR@iOOTF+)yumkH!%P5c
z)6+goL*HTU8^WnwE6tzdtWK<y<DAa%;nID?n#(LVOl>zt4{a}m>)JLN4@|mvRlpv9
zPZjzl_hGx3yiWkL;c{uc|LGDC3GmxTo3>6c)Q>w99NH7mlKt^l?Rvv}?>Dw{R~yy7
zWA5t#MV^{J6X&N(C1!mYcuU{FIHYW%+s2k5B4<!6Er2wm)3{%3U;e6WHq#DfT{>oL
zY4`PIs8nvdvUEU7<5^s>yV9}QNwJ)V7<boEaLYN)4U^j<I?NTQ*#LVH0lzQGHvFv=
z*S40hID<7$zbDBRd+T95sFXrKEy%BpU=97?!;Qius!0>2H*{jq&g2covel}srZ;W%
zD6Oofw-%Am9((;TmvHhfIsRF3M(4KPukuwl_55(P@4GdA+>uLcgF{O@dY$9I89Z()
z8dg(nr{%&vAL~cT88I8G1mI|~JkG`j`4>+O2+fA;ckJWjQ%}c#pOeBh<J(e@62e$I
zcxgMA-Ut?60uFJSO7ShM`p+U`ZI9HUw8K(~ow*NBxf)LaB>u?D5sRb-<aTy`j6UhJ
z0L8BjM8};ilS<rMO<bg5d;cHHPx)8+v&2#^Nm?m-Gh)I$*%%<aE}N^jYp<h~thDXC
z^vD!#*e`Kni$z<$4(=s+)-WJ+;kKo1n(9uHJMe145yP#Wv-taQ_SYxRW1mq8Iq1P+
zHOJ745of|vOh>Zz(CQeE*IwA9={?aV+FkV376yysq6NqI-045B+a4-~qDK2uJK?fV
z8O0dxQnS;Ei}%1M`TB_)(|DPpvRAqd_1X6i>G%s228*A(I}RT@xsczWpPM|*Qsn=)
z=t<|R4w+M@&hpPynwDd1UlumWyI(vb`>9%2cVewCg`X=+u7K_F<KCFa!N$t3GGmtP
zr+KI}Jv+Wg{VqeUq^S(u2a?@}gHC+II!v?(H4v3|EP#d4?#Qt(<E&u4qB|XwpzDpd
z7=#bG3B2@1sBRR^-BWXoAKHJ#K(+`qxuy(`(9^JVY4)#qsLpVlsPUcK(kJ^x!^6rn
zgGNzA$bcT$O{npkrI4fAV0$5F5G$q;iZJ0t|K8Q$M{!hZ*4ZxDPh$pgktaL|K~<og
z>>h{j0PEpS$6I%d($sS5jyqV1uEAVREuZ2c8P5uCu!Xp{X1;b`d5qt76Q;@{*p$n#
z;K-fO{-Yov>Y2t8L1fyr@x527xmWI9ts2tBc6-#Czsh*@nshohU{ZCTUq<D(O*VMv
zaD=G`-Y~hd7%z%4HmsV;<oL@*)bUtro59fuuyt6wu53=g<G(n$Plai#K&cHrwd&}j
zAstfmT>6Y)jm1~^xX72~5QpQ{ju*Kq)aHOF+?CcK7ty6A+GRegX`4J-8`{4|=*+zi
z2jg4Vjl{9L8cTilcqQDf{KkxF0=kh&enoddOZAEH4Xo^WDz%=ae(R31@7}pqwZ!KG
z!`a@Gm~(tcTEl(ZuQ*6~8o4qYrjGQwkXw*Ub(b6)v;-sdI&0y~u)7l(%w*et=10r&
z!{j%-^f>0{X{dE6;dXfJo~PjgxGQ0(_J3ejnxZe)tsJ~tqa$XrM~rm)2voLSy_~#{
z`5ACyG~S4g2D;UZoko#XQf{!H(Jw#;ifD>+GJePIICYbf@<piixmY}Dd*k0vV(X_W
zk69CdbHf(A^da%@i{LBQSZjyS2-!-cl%BwXnJ-7xgk=9dcC|8JeylI5|Hm*FH(V9h
zX~y$s{$%#EU54HtSGvdM5Nmz``-0iKe-R>z`<5uLG?i&e`3P3sCa!IhSSoYvfDpeN
z6^VbtV@Ba!YvfX`?eUEZK2ndKNz=2FFGh|Flm3KWdZD>{1AN-A*=QUgu;Qyb8AV3p
z_h&oN#9*tFs6e;qZ5Urn%{Qv+Et`J4y{e3=h8(iWMAbGWt3I6FJePNJc%5;$-li|(
zFyB8JXFE@wVi6i4q)BhhloDoR;Qg~0cP3eqC<kZuC`x3uEK!EAFqP4*WVvSbpLbo#
zgUo|qkUO1-Z@W%-*=9B*_M5w-)PQGjjLBiI0DT?vN3&dZP6vn=Z_~CFkxHUidu}u4
z{(wO1+Sdy1lGuK`(tR1QB}yOv5_{|>?=~S{jQz{B*hhpTsoLiY5#TBWBA~I<88z7V
zZNFCRy~(%z9)BQZxos%|{d#RFsecCi;Xzt+KWD!3rprTRBUj%|qDEfH@W|NDsT!=6
zzc^h3Jp})KHnFtzCF)W|YG(C*ruI8Qxml9l&h#SIe2lHcW}6p?2Z~m;n&Bl$W8@$$
zeQcbP4r;Q-Xs(7_>Fi5@NxJhdWZ*vSeEfQ5TMo$wqe~U#Cft4vmz%U65#R6+Bhga^
zVnwBh%Lozyx)fpqnnp*m{@Gf(x}KaDr`1x}w4!uD9);f@2_a!}HIzclJU7kswcx}7
zyf57ulLI^XlP#h(K#=Ffvml6O(7pqGopYoY^em7UH9lsxXaZb&s8Nys<Bu5aRDohO
ziF?1=U}3c6h{2wEvy(P)GqtaEpj1312zkMOTG9D6dT`cc>1yUL^N3hAE@(d2foAY(
zWvd38se!caz=fuWVwG=|EoJeRrAifvq=x#hUWi=hS#(8pHO2Kz_D3SnaVbH_qnBz*
zjxj(rc`-w3zXn7rr$O7JCD#O)y6;?vF6KhD_Ac1X-rBV4-I*fUg)sx}USXqlbw(9U
z6w~f5y4zwS7RGBRr?O2@@Y1z$1hNQq_{m3r3o{3PY`@y5-DfH2V%R(HHr-dJ^$OQg
z83Xgn&hvg-<*V{p#!_)z&E4Jmc{{d_#K&hOzs`}E8Q>RRkNERHc38P~qqL_mu{P;)
zMc}LVo@zqTk@#kA{p}T2m~@QZrs3Qp*T1iePy1j~wv~6I*7YB+ut(O+SC?)aK-Jbu
zKjLBN1aE{qjh@R34KViL)o|L6ySmml0av#zd9F;vNB%|m&b8^j?qMv}jrBa)Du@!{
z_~%$FK_Jr%3We&+aBNXNaUNU?a-kgD)n8G2#R$a|4NSbINc_?`hhm3C%s(c?nMO^3
zqR}2E>5{KOYB`I&0Kv=MPw8odnSA@qS6N)NYi2MuoB)*C8<1-^{iWvqSD#$DJ4&tR
zD!lZ}tTcRzD5m3_N2&MJQ~c-8Lte$4$;6du0u)cy<)pH6$$7InRK^Thnjh+MD^r4T
ztl`m^n$%k5xJ}8!C;qHiowPWKpz>?;C5UJf$e{ULpsgD2sdW7^d*mf3nb{J2W9b;8
z@20Tot4SuBH-6)E@C9iE^$0;s&guPF4vFyC<rhQ;y$_OF<mU~&LOw_r!5iwJ!OVp(
z#;E_%Cff2)0+K#`CiSp&A0~rJW7HRz9gUoCz>S8~y%iz~pha?7NmLeQ)zo?7%!-C$
zS`yZx!R5X(T(FYRntwiN?y*2(&WgRJz4g*dsYU3^Ije0wLdYNjIFd<Reogv&dQ_=!
z6QX_0!V>eciykfLaihf1X$gQ)d_{^H^uD`8^K7pM&N3=!?LgeVdk#KVQ)>eVmq}6<
zQE-Cr5W2Sd9-v0v%<_H^SYFz>ox!pr+0}8RJizBiBeHsUd;I+f>2}pg<md;E`?AYC
zA5{XbWxKN#y2kIkNFxloF}uoNBjSUZ1P~mzdtw$u*?uwe*2{A*6U#f3^R~H*C7A`3
z^LF6dg465Yt_yrrJq%|{-J~N*fBkt@YQn#lI3&#7f2<f#=s}(pCGd0NHo?NJ04on_
zTTImfCXw!X`Ut}%pH?0r-)nf78VS%jeL7jgU1u5cHj}T9ZR>b_VNI{xsp_p7`<$IJ
zM>68VK6i%i*&hC--Z}TmSat031xbzd8x8<ju5VcA=~qgs!qlAcAjKA3Re|+6$BQB8
zX3cq^#<zqfRm0bB9vHKzPVH1x@MP=pCC%`&y;@o)({n=97@|#SVeMW<`iYVjktUdZ
z4Aiw$Ru!j--j(20sz+==Na?Zs$b06#kZe!m$ysM@@kG62o%@{#WjF(hB?f~Hbm3f{
zYuBsRZnFY}i`<DZe562HVou2Sfv!sz6A8?9gP8NL>(tk%y)M7GJSgXTdXxwGoBJZo
z(n1EsY7mZM0E;_~M4i<#OArRRu~VH138DxCCbq*~m(xzXYXUNdUE_?ce)KRJ@a>-P
zrqplSKzEtE1a>{E>oKpJxu(1ke1XOTvDIY)T~epfWP97q185-+*{5st`qO5&r1PfU
zJjbDjy$WVA@y8_luGPMr+5ppD(&xjIqV!eUn|wO<o{)LP<4%FGwAO~O>72F~r>HvV
zPrjon_Q|urG(;kc9cpi^_~B?eCC@rR*)j+U$zz4)%qHbBRC95Q_jO${5;KR1E5%22
zH*JJHy;Zu<0$8hRR0eC4d$#<8TPqkWkOx#*#AJ<s`ZiYF!UqWxGt{;zJbx>m@3^TI
zwdVf`r2XRkWtDAV?u`WM<)UDCDuk2@ij~IQ_H`8;b&HJA@kSw*u=c&uRlF#CP8eaO
z{g^Oed0N(1&mGv?c^Bh(QTgeIuJb*;^?g-frqVPlh6UPxerVb%1nFlM{4;|d|BuP5
z%`WIXoP1xl<tz)|Q-aq}mDyWNJn@5o0^mx=<mX@jp;_oxpLx<5wgYw9NI<7=T3N<f
z@DF<^9{aw45ar)6_l|(Mr^WesJdJ;17cn|@HrX^f^p}Fq@|Q!?mz@!+f;SV&68u#+
zDJp~mIx$sk)mHgio}W}9udX0$)WhuR+j{h^r(GH;Cd4+_0cIqqn$7}Ex8F130EF7D
z1Aaa1NvN?_oso>RJy+!Dr!QgRz8UH;(5cszR`k6oEI2~fu_9bAaw9oGrVNa&C+AGj
zO7)3b%+0ynmrxq2+iJ?GaHLo(e<nh-Y1~9cHU;uYSSm=Nt)!KtA`$aPtzhtw?7dn?
zcj)Wh4KpJP`QIBB<gnMD2rSyQ!eOby!l$2|9+F*lf;v<cT0V>jzO)+OoOQ$LZHRS0
zBD?BS9B8N}<k(2Sj#3^UyjNBpQP{8~N3Qehg`}ZzOXw(@zgSOd`bP16EjEcfT2_)2
z{)wL#E$m$bu0G3X(sl2vB^^A-kpe3&$RqejoHl4)yLyI4+3l6(Gho7_?3ti3DH^xn
zRK~06i)Ni3M<)64S=LB*Ot!>he)8+5lT49IM$eW0Hy5;FEKU2uI-j2w+REejhuFqA
zIGAyjuG=mx3arZ#qQIb=y6t&VB+*UY6b%uCrmJ$lva%BJ`0t-%w=X~W+vAs_O2&t)
zI!=xoBkXmafz@QI<=74Ah07ET8JLMK>WP^`LV`7X+NwPK6c;;%Y4z+yqVFdiES{u1
z6`W-2oOwh_(dt?q7Zn6|pZA!vo(nQTAXTFlOvI6hAxuMgjhA+ArW1RO<o80BAZ`H-
zb6x06)AM_7k5j;(L@8kg;Lznk7vzh6L*Ee#ww5>#pkCV45;Ss{mhKn7A6pwXk?`3P
zll$$P-`{q=bHVoBLf>*N64X)3)K1ZrUomiY0a_i&NXSg*UU?OlOiyKLE2th*Po?H*
zJ)qE@kuz4euW<5CW%3al)QP^X8;sZKB&;$vwsP5sw?PfRwT<Eiwl|VAem}ojHv$3a
z$CI7xmfO!dD|H#BFTKW}z9Bt;K|o2-1CAf5!c{aX+^O^WE2t|ob+u3V+n>zXllE3&
z$geFQ&CZ*mq%q59rmz}3$-Dt1f_Ds*pwkF0H3hwCH5|)c{=sp+e$qJ1;-b|b1@l=&
za3M@MvmfEY5+5V5w#KmCDRnXSN72`J%cm&ep%K?;#Jn#$E9yrOp2W$Ad(V|BFne&C
zg(*01S&cQ4w0CQ;-M>5&X{ZylH9BncnAiGtQ2Bc#=}NJ;uII866$9kMEoUsc)scPa
z`t8GKohRT=M$b?E7AM)Q_)WG<YFE#y#oA7-dtRsUlo%{v!9-L2FhNW50Ss&MyqL`N
zxR`u+=X)}9ZQcgf?Vy7nE&AruO2Tz(c8QahsX`yEyTmoS#Mf-_yN#xvMJ#jou~T|~
zpa>^A{7CeA5Z~GGOx?~}<}7;fVa5oa^IG`GB3tT6x0_8}9FW>BURXTg!K`@A*>?>S
zf|QvNje!7<onO%uAQ0Rn7F|YdKn#i|pi-5Fdt73l8+~!mpSpy`C|DnkRm+@t^XWQn
z7^T1p<*R=wD!h#`9Kf&M#*rt~I3|TG7o6AdpR_5<XU<s>GCYzkTzig;jqx!)3c<&0
z*ueGB@S{6B*6rP&G0~M~PRq*Sojs|~2iIrA&j9Ytz&*!Ra;|w&#>6Ma10~dhMc)ba
z?-qE4Ket79WP+Klx#}o3UlT`-olj)4%#x9@nmCDTQ(H@B_Oj)`R;Fif(qfNXjnPk4
z3zIs@)r)%?t?*yl`9$PsrqX_t7CdnqIyxD8arYXOjWz#3DsvM4;#BJ4=mH4%`84qA
zUoT*H6AC=PYrYj9{ra<%THcz6r$5wCncTfzODrdTpfyZ43H>>lc2P7~slqXIM?fyA
zvYE=;rSd@l-;(^oD|qXfK(sv$)~c32F||iu7@oSCzXAVVm;_+03r^JzdYFDm`9o-W
z7y4ly5=-dxd(WSB>}7w>AY@7b?Ug636$x;T-55Ez_O=0{cu340+pgVqxrz1<?Q{y{
zh!1%{(S2(a4|tq+%@;DXjdeP=I0tCI?ey4{1A&0^0~!|26Vj81u)*`0YatEl1{(hh
zu%Sv8wDb0+`r!^EBw4ZJ3BB{(=T5<qvUs+zu?jBO&3<X@^Y7~NM-FQxi;Df6Ip6~D
zV0FOEP2VjS<yj$AFj|G?w&+@K6Nwg}iGqWFf7{O7ychZ>cr4xsZ2r?k6e(5g4s7(Z
z>VaOfKWNc2W0IVmZ{UMX|BXhoS^eP<v-|Y>;`iXis3;F{=I2(??eP8o_N*qPTq7)=
z114|t8Ru}_oRG}ID9jjtp2pGx0IEH5GW`_&Qx$1GCremR;Ujmwb48S2(N)`}PdLl3
zBuwg4O1hAu;1|dl1<XxIe(kOOK^CS;Mm`(U5ye{SZE*|ESq_qCUZ&U39b?c_n)avG
zj%36p&_m$#XMxtLqNOH3=^ye9nYZvWlUw(zK9Z<pTL|xP@XpK(akVH7FsYxnt`bPy
zt1J&A)q;0?^vg^Y3lZbC{#!zzS-zlI<|WR$jJ=35k76NGJg}M?sWqwtL*p=2Dn43k
zey0#8a@vtbU0<gxztqeLZPWWC0wYhSjTWhrCBEChtl~fN=TTJFTqPaoyz@tFB%-oO
z{w%6vupR8Bc4W(gHh+HrVE%UsHo}TkMU);@KMmhwpPW44jxi~Zafh3pl*`qi|Keae
zf>xrnpLLmwy}4>mdxdDW`LCG@(fq0f{c7H6EEnc_=PFkjUY>W}c<fXz8d8esZ6X$g
z_#dUFCw7f*`nwjdOy@1kNkCT}URd6yBa>aLa|g9oPr%QAcXXgO*T=ij_pYkPp3g?#
zpnOa4zbU`(^P4)e&vlN5mZ7H4zgCu<lsXrt5Acqla599O9c=SuWB$!o?a22Yqt!VK
z)Q>-GKp=^83yCId(1~GZ&NMDd&K&IP9$>w_lGQA_?fK}Dx&4^id7DXt?zeU$#G+w6
n#vO%nMc?)RsXxRl?fsKP!-j8!&TjfU5aRVgMn$>`VjA#&b}TTz

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index db3f3875c..805784f87 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -109,7 +109,6 @@
         <color id="flag_clicked" value="#7d929e" />
         <color id="select_box_ruler" value="#0000ff" />
         <color id="select_box_grid" value="#64c864" />
-        <color id="edit_pal_face" value="#655561" />
         <color id="palette_entries_separator" value="#000000" />
     </colors>
     <parts>
@@ -203,11 +202,12 @@
         <part id="toolbutton_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_normal" x="96" y="16" w1="2" w2="12" w3="2" h1="2" h2="10" h3="4" />
+        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_active" x="112" y="32" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
@@ -1082,7 +1082,13 @@
             <icon part="timeline_closed_padlock_normal" state="capture selected" />
         </style>
         <style id="pal_edit_unlock" extends="pal_edit_lock">
-            <background color="edit_pal_face" />
+            <background-border part="buttonset_item_active" />
+            <background-border part="buttonset_item_active" state="selected" />
+            <background-border part="buttonset_item_active" state="focus" />
+            <background-border part="buttonset_item_active" state="mouse" />
+            <background-border part="buttonset_item_active" state="mouse focus" />
+            <background-border part="buttonset_item_active" state="capture" />
+            <background-border part="buttonset_item_active" state="capture selected" />
             <newlayer />
             <icon part="timeline_open_padlock_active" />
         </style>
@@ -1092,7 +1098,13 @@
             <icon color="button_normal_text" />
         </style>
         <style id="edit_tiles_mode" extends="edit_pixels_mode" width="15">
-            <background color="edit_pal_face" />
+            <background-border part="buttonset_item_active" />
+            <background-border part="buttonset_item_active" state="selected" />
+            <background-border part="buttonset_item_active" state="focus" />
+            <background-border part="buttonset_item_active" state="mouse" />
+            <background-border part="buttonset_item_active" state="mouse focus" />
+            <background-border part="buttonset_item_active" state="capture" />
+            <background-border part="buttonset_item_active" state="capture selected" />
             <newlayer />
             <icon color="button_selected_text" />
         </style>

From 21a63b9fdf48316930c2ee1532d4b713727cedf0 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 19:18:25 -0300
Subject: [PATCH 27/31] Minor change in formatting of conditional ternary
 operator

---
 src/ui/grid.cpp | 8 ++++----
 src/ui/grid.h   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ui/grid.cpp b/src/ui/grid.cpp
index 180f2a3b3..a51b79bdb 100644
--- a/src/ui/grid.cpp
+++ b/src/ui/grid.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2018-2020  Igara Studio S.A.
+// Copyright (C) 2018-2023  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -230,7 +230,7 @@ void Grid::onSizeHint(SizeHintEvent& ev)
 void Grid::sumStripSize(const std::vector<Strip>& strip, int& size)
 {
   int i, j;
-  int gap = &strip == &m_colstrip ? m_colgap : m_rowgap;
+  int gap = (&strip == &m_colstrip ? m_colgap: m_rowgap);
 
   size = 0;
   for (i=j=0; i<(int)strip.size(); ++i) {
@@ -245,7 +245,7 @@ void Grid::sumStripSize(const std::vector<Strip>& strip, int& size)
 void Grid::calculateCellSize(int start, int span, const std::vector<Strip>& strip, int& size)
 {
   int i, j;
-  int gap = &strip == &m_colstrip ? m_colgap : m_rowgap;
+  int gap = (&strip == &m_colstrip ? m_colgap: m_rowgap);
 
   size = 0;
 
@@ -418,7 +418,7 @@ void Grid::distributeStripSize(std::vector<Strip>& colstrip,
                                int rect_size, int border_size, bool same_width)
 {
   int i, j;
-  int gap = &colstrip == &m_colstrip ? m_colgap : m_rowgap;
+  int gap = (&colstrip == &m_colstrip ? m_colgap: m_rowgap);
 
   int max_expand_count = 0;
   for (i=0; i<(int)colstrip.size(); ++i)
diff --git a/src/ui/grid.h b/src/ui/grid.h
index 4ef3967e1..d28f86505 100644
--- a/src/ui/grid.h
+++ b/src/ui/grid.h
@@ -1,4 +1,5 @@
 // Aseprite UI Library
+// Copyright (C) 2023  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This file is released under the terms of the MIT license.

From c9470472afbb28a474bbbca8a6b1c5cd6a5f483b Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 19:21:02 -0300
Subject: [PATCH 28/31] Don't use string literal in lambda inside
 ButtonSet::addItem()

---
 src/app/ui/button_set.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/ui/button_set.cpp b/src/app/ui/button_set.cpp
index 0818f5aca..361fef8a8 100644
--- a/src/app/ui/button_set.cpp
+++ b/src/app/ui/button_set.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2022  Igara Studio S.A.
+// Copyright (C) 2018-2023  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -13,6 +13,7 @@
 
 #include "app/modules/gui.h"
 #include "app/ui/skin/skin_theme.h"
+#include "fmt/format.h"
 #include "gfx/color.h"
 #include "os/surface.h"
 #include "ui/box.h"
@@ -237,25 +238,26 @@ ButtonSet::Item* ButtonSet::addItem(Item* item, const char* styleId)
   return addItem(item, 1, 1, styleId);
 }
 
-ButtonSet::Item* ButtonSet::addItem(Item* item, int hspan, int vspan, const char* styleId)
+ButtonSet::Item* ButtonSet::addItem(Item* item, int hspan, int vspan, const char* styleIdStr)
 {
-  // TODO warning, here we're saving a copy of the styleId pointer,
-  //      which if it's not a literal that lives enough for this
-  //      lambda, it will crash the program
+  std::string styleId;
+  if (styleIdStr)
+    styleId = styleIdStr;
+
   item->InitTheme.connect(
     [item, styleId] {
+      auto theme = SkinTheme::get(item);
       ui::Style* style;
-      if (styleId) {
-        auto theme = SkinTheme::get(item);
+      if (!styleId.empty()) {
         style = theme->getStyleById(styleId);
         if (!style)
-          throw base::Exception("Style %s not found", styleId);
+          throw base::Exception(fmt::format("Style {} not found", styleId));
       }
       else {
-        style = SkinTheme::instance()->styles.buttonsetItemIcon();
+        style = theme->styles.buttonsetItemIcon();
         if (!item->text().empty()) {
-          style = item->icon() ? SkinTheme::instance()->styles.buttonsetItemTextTopIconBottom() :
-                                SkinTheme::instance()->styles.buttonsetItemText();
+          style = (item->icon() ? theme->styles.buttonsetItemTextTopIconBottom() :
+                                  theme->styles.buttonsetItemText());
         }
       }
 

From 606fea4214efaaf20a5184d1db820a2019995014 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 19:21:57 -0300
Subject: [PATCH 29/31] Make buttons to select one window/multiple windows
 bigger

---
 data/extensions/aseprite-theme/theme.xml | 1 +
 data/widgets/options.xml                 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 805784f87..3fbffdf72 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -1111,5 +1111,6 @@
         <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
         <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />
         <style id="ani_button" extends="buttonset_item_icon" width="17" />
+        <style id="multi_window_item" extends="buttonset_item_icon" width="17" height="17" />
     </styles>
 </theme>
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index df9f258b3..9b7da391c 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -35,8 +35,8 @@
             <label text="@.ui_windows" />
             <hbox>
               <buttonset columns="2" id="ui_windows">
-                <item icon="one_win_icon" tooltip="@.one_win" tooltip_dir="bottom" />
-                <item icon="multi_win_icon" tooltip="@.multi_win" tooltip_dir="bottom" />
+                <item icon="one_win_icon" tooltip="@.one_win" tooltip_dir="bottom" style="multi_window_item" />
+                <item icon="multi_win_icon" tooltip="@.multi_win" tooltip_dir="bottom" style="multi_window_item" />
               </buttonset>
               <hbox id="theme_variants">
                 <label text="@.theme_mode" />

From d95a02173366d6d1f2e03e05b19d7fa5bc38457d Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 27 Feb 2023 19:38:36 -0300
Subject: [PATCH 30/31] Update dark theme

---
 data/extensions/aseprite-theme/dark/sheet.png | Bin 16809 -> 16859 bytes
 data/extensions/aseprite-theme/dark/theme.xml | 161 ++++++++++++++----
 2 files changed, 130 insertions(+), 31 deletions(-)

diff --git a/data/extensions/aseprite-theme/dark/sheet.png b/data/extensions/aseprite-theme/dark/sheet.png
index c62a599a56908cdff72fafdf2729b358803b76fd..f92d9ebf1e361ce51d13eee333c9dedaf32e852f 100644
GIT binary patch
delta 15986
zcmXY2bySqy*BwegP`ahNJ0vAVDd`??0Fmw<ctAnAL`nptrMpuc8cAsZ8M+ye0i=G<
z`>l_~nm=aEy?5???m1_lz4w&9$5?ugkt74eS<VC;-^+aFVrw-dto@#3A*`Rl_Cu^M
zJP1Fd=gW&Y@<~BEo&&uq{NLO=V{u2}7LAT(<AVdAJ(Oo&;-}T{1_qz?79pytQUq0#
zg+^-wqRD2y=lMA=hK+qKz7((3)nLju-Ve#>Y??E*?>y>6F9>d5y?E|5wz6*;l$(AF
z<l4*an~pz#q#>Etrz8yM=pDx8%7bUu|NTwg^4k9(r%SB-gRY~i{w_?h8Xa(PyaWxo
zCxM`Gfxn!W+qu~dAtv{zbz`L9-GNRkeWWGuL#ySWz)5ED9=W}JGMx?(Lfjpu6@;R~
zoF2$5@^yEGr*5)ewXit9^~ajE3P=S|H#*sHGEU0G(tks+acWVkk^1`jjNDvf`njw5
z4_=Dj(QU`!JCDK7zxP@viyfFym<Wj9H8F+u?i9;pF9|+@)6T8Br+8iGcHP)iv^MBd
zd0R*URfiX|xRCps`V=Xze+^!ow^;9;?E<)Wcj^+W`UFElstU5XOn6Wqn}KpftXm?E
zrYZ}hM7zsD)-5DC$3(W@9o6eaNgOW+VT$=XCu|c(kkMqd)LQP`0=bGw9LsqWGBbq!
zyS6KFT_+?VKUCc8I(xKwjtF@&-)?@T+GxgapIA5fHtB78cvrp-6LuA*``$*@Fv0k9
z$guy~htNkM6q8e|+Ah^C!2s3Qx4bdW3MQj2olsAKL(eCZE3>}N@To=c<zsxjj!1S?
z>yrW1oev)*YryRbiFIIrht(Lc&y*<6b<Fz@d+(tQU%=?t7-g`uWx?cI6$?D?ahIsx
zJ{RX+;ZC3W*>)uOtz<+3-kOpiRo^z6!9^2UG1#ErOCxZN)bar?OdHK7W>blCVMgVB
z21)~+Eh0p#+I$RT5d=XD*AF0HC*QIy!Hz2$j`JLoa4D&UzmBU`7`u~DnbS>&Om|u8
z9O!&VwpmZ9m~j-o`z#8chOb=hs&5Rq(kLfKKMn0lXmn}hQj?aZ93g`()rYjsvx31)
zCWd+NDQL_50CuK}1)_4&|3uHo->o5;GZ$@Z6>9wa5D~F%Su1Tc)8>+#)mn=1mFC^X
z`1yL|532^V%BIXk@F-YLdwNM#dRE%p8Qd(Ta$A3%?k{Hczhow240?fx+2~nWo($`3
zC({|FBqJkH6&`uz^VVNk#MW7iRyHXYe#{1aJ;Y}X++y{UN3w0RsnAW|v1DdvYki23
zwO);7N%O&@f#E%@2!!Ur?CPlA>>E>l0~eh?IN;mb+H$<^q<ZlN!`u`agLF1K46zpX
z<5S5ZCH*-*F3LU5iy6ullR-XMEp8f_)O1^wLy{PYdd;32pvmi4C7OqsZ=&ku<;4bj
znrsU6Y%o#){BFkhNkW!Ksb>YfoXLhCwj*1=KK*d?g;f9s3FOIU;cr_|%YB_qO|*25
zxRby*)!I~#hR3~ibxi>8ni%aP(%Mj4N+A?(37IIW@h#`Q)^&ktNH9Lu9HDe{63-ZV
zOmNkgv{s*U6(Q3NU%L34??0c>fj;c{kO)9xC0M}AIF@-?9ByoQT6XNm8zd|L)b<Gj
zQOdOsNo@l|egqe#AS=9hs>Es);kf#0wD)^S_R`}=Zq{&zugc~OtlqA`8vMG@3Om%L
z^#Y@$NG09M0|za4rNxjaau;b3ZTQ*QneK+b&vLb~uH#o4GyfuRqRc3<*mXA249FZ{
zB?a&oj<k-PT=X9LjI?-5Rp_u!eWxXh%%*Eb|Asb=uLigjw@}U%1aF%Sik9fuzqFqS
zunt`X>c#Gt!%H1X&~=x#jYK`HU|a-?Z=M!DhgjPM4E^*GnJ@Xm<Y6A9^6O*8>s(^&
z_^=_CEtWU=mql{80!mdb%1ibeKq5gM|9d%I<_(0kN4w7OOLZ2Av-fniHp9Ffqh)Nw
zdmY}$B=#OdNF#f|)chG<Cv|1wO$q&UjGvxvfprkelgtlEb%XQaeUe%#cDxJT0G=rp
zd@rE%P1w9oflTc#!<o|Rd!54pRD{d0p7cBaFyVe#6+R8ZIE>7_fQTASfP@!6-yfA}
zlHylb#(?~|)w`7b+R~98n~wyt#JBiQ%9eEwYaMw$JhGLaVDX2Lg+tztvR335mW<Eo
z&l!=Yk2iFQoZr0p0A4(*5JdwD;p6!32LcZ>`Cy(qYB|D2(J5R>T{%$bFU1~GlytEF
z;`~v}lHY4NhTWDE3j_fKfCgN#Ni5gX3{W+hF2%5H?Iu(7QZygeg@nM&4dsNeW<5nL
zI&7Kg7#QBf#>P@JF!Upluu_E|B1|zEvEK%F1)9397N_#DH8@JuJQkkMnK6blzKdGe
z*Pf%Ab!_y{q&c(~5*7Us>dTB3+SjMrV8+iUAmF=ZP#()?VPWkJD65;cSfm68EHzNb
zC{5%3vM2GOA(>M#`c6hbxPD$s8~;Fa#KD$G^Kb8C2HE+d=}L+GsOTl{L&N%e4wT+c
zrD9Vl#*b!%%p=-~F&QsA8sZIm`yvzJ*$y{tRPyb=E+0ngFhLL6`ILv`djJQFHJ!xh
z45JRDiBV)2PiS`w&=QrINmHw(U7~TBPbR-wq-e_d?jMA@`~~suWJIT<089dP8aSRM
z;et7#|6}l5<2E{fJdgK;F4s2fL(<dNyalWeE}gKmva|c@$K_*NTU$qwIFNDqYv+>`
zwo}${uB)ENq{g<Gm}h^R!t+={$DRo1X@!4YUi(L2b%~i144@a7kbT!!>Vw1TlNj)?
zY78a~f1|`nrVSo!NxHR6eI`I>Nm`Wt9_x#$gvl8zb~xfPN_cVs<?=g9TBq?<?JxMT
z<L0ouT7}Db>^A=BU)S#D{4@*uxD*qm#3r8}8ToLWm)S|Kn)tj&n=uDHhL|JiJwu9x
zn|~zfV~PD`54hv%yBu?*QVFeQ66WO?!;U|ijz8_H`MH~+^dO{8YdfG5j8f4}q+O#9
z_JnZzO3mNW!%iG^dG_&2+ixH3Vhc~m@DyhQp#ig4WFjb^AN|!Bg9hW})<Ha_)2x4q
z2<yh-caI@GIyphbF1ddqo*EaN6gACo4O<Y6zUF6}0kBv_Y|5lxn~hdFRxdTzb&#jN
zp6AkwNr`$N+9c6LRGAcL?QZhz3&xzMxWRaA&-^9Z^^n(i!}8|7Xl}Q%j7G-h7WW65
z!Ky&(q1Z_+KU%?eV9e638khwMK$}=xE9IKAR5VTXH6FVX_-v#y2EGhJ%{nmSd~dY!
zUEa~Q0PaecI;0iO_ReI{&smC@M;^JxvW&m`faEKb{lw>pM}tw0Wc^*3hZQo7n~i7J
zU>_g-!{q9F%VgJmY!Hb(ms8*K$9&!35iPm;eqT~&3~&0%l)Fr>yP)wDniq01hPkEx
zU0>xaAdTjM)VS;3U7mF3s;uiXea>NI7`t#yDzM33(dx}V3nG`FJG~KSCZ<OnNp_lk
z-%L%RFw?{9M@>~Y7_HCQaSwv^h&3Z__CmG~->qF3dS@=%RvHoD5-}i(wXzoP#>U6Z
zyK~ppUQ39JM+`6o5$fyfLt_W8Fufhj4?Wksb1b9I<E0IPyLI3mn}&=7xC(#Qng&vh
zfneG6lv3VWNu%<Ee}qC;!m_dlXA382FsE>+YiCpn&_KX=RkLtMY)f1Qt)GvFOTRsV
zueNpdJ?D<*Z1oKI#xdb2OkgU3835Dm>uj~vZH_9zQw3ASK~Xxiw?Ce4sVOUA-wQ&L
z9(YoG+i}Ta@96l@Z`p^6A?To16A6@`?nN1{*t;neexD|rzV(ZLviOOl$iK*Be9){i
zE#1E~VgH?zk8Unc;eUg=E;^5kq!|;c{m+RAMM6Z0=6FQyN~=CUIPLLNIYl(|vQ_6A
z_(KI;hLv8S0?`Zh-)*eg%wW>~+zeOMaZ(*Ag0?deF0s)b<Gj2NP*V)%fMymo7|Xmt
zKX+f`8#|l{8B&<Wj`h2d2?fk1xUq_`0w~xKH6u^Vpu)p+3A-LHC|J3xSUyF~QFWc*
zxS>d6nc8YvTBx<Ov}*morNgVrWCnD!v`n#1^S4ut20uhb(&VcAIbQM;VM^SqfaSK)
zEw>#QXJ-u&{K__GvGxEGQm0yg9@+O?^ZQ2S+pbm;8;GFRFA2XbrsH?)Qgv&jljQiJ
zkDn6@I{kaE*70Svdu&?dyXxq#eh%o5A3y%orz4+gYH6WLw4tI@f{+(Cqnn~hZl(RT
z%TyvGKV7bb49CX3NhDDn&dMg)e)G5$9GMBOZPOWh)-P>;!d4Xkp{UuMrO6DbxR7bO
zmW)Biw}yPMWkHhn{+S^Y6#@=43}8CTM8uY8W<d9A=m+fXPfmoUaSqmp@YXN5W2lm%
ztTyNn_h3k}4HXOgzVCT|IV*WTyieUz=1yTc`4rXToQam0T0A4_F;bgr`ZUN+rI~)b
zsh^<cK{#_#RRFM*=kr8NqskB`C+-9BGO~TVL+7Uyof%wXXO7C`l`U0W;zV(=QTsK?
z1r7rc>-GM4H4^=3<Au`!=NyUwj<2UM_pHzraNXg<qJQpsz5d1BaW6B%DX?B}1mE{C
z$zSFX$?&rWZl}A^rMOOJW(ppEx>%4E(x>|h)rf|R0Ed;gZ{5dsNnx*;<ymbA^&iid
zToHOBVRTBv^B<BtF_bM8l~e2~^W|PuF}m^ib3d7r%6vt{_wjHOpO8iXn)XrJ4C9Qr
zx{%QrLqi!Kr@~;vov!&6W~B-zq%C%}xpSzBZ-$%ag~h{x-8`PGlo@DPM!DVIco8F=
zm6x1fAF%H9_?Aq?p)}s{P33l~v78WwC4&jx)I*Y)GZr2#Y}@jIRG$YdU-x$d8Hzte
z@S(94y))&<11%z!gAwm^<OF93iQ8ShIl&UX;GgvWNF!Cpi7BdWVxUhWBX#dj+hq1z
z%_kqYXTD1+@LGF1vOt|{IvcJ7Wv7~4f&mLmC~2)q$Hr3GP_x-O<~9?I&9g;nMD@HO
zszd#>CqdA8dKOEjtL9NUFboxQ`wtr7T1s6uY&(2jL;CzX@vhVAP^DfC={sz%VMz4;
zMXnc}9%BrZkJh?yZd&g9CV~IWl(^)t*7>5U1r>P;(_XS$$C?Pt^Y(eczmS+aKwxoJ
zsmu`w1`%O@#MyS6uab&f#!6f3;S~tpI}iNiJWzL8vfQVf<8moH<{jySUc!>0361&1
zO=V@3#q9y*;lDVl474Nh5_s~a#NX4IPzdTmTK!4hAR3d}e3Ds^X6nmr>U3ZOI9w-J
zhg-G8ksAw#mff<jS-(zJ*Z{;@tx}(pGfqpSbPi*&{zg&2m-XoBRCV@}Ln8_b-cSMj
zw}<#7BbWi!n-M`y5;|HpU6)=n5(!*iZ(1F*2xqWH@Z<f@+3J`UKv2pCJGu<45U5pU
zi1d6>Vg_~xC%^X;oK}n)wVZ)_EF#~A^yVQp%>OEn4K0ph;df)8LxoNN#s+oucACd)
zVXrAy8DN8V9fr-Q%oZ}Fa~tMAJZ~8eZL!W0?5Dg(W5%noB9#dRpz_m)8(~F1BpFgA
zLJYlsYZM9^$W`S>r!hE;+>)*>6%;*hKzmM=RXti$OS@q@?ZGn^A^7-8Z+7l+t>vuO
zAXt3uXh=Ar+HAmLb9U^{k%#b$qbX!iY)~kvDL(KHe?Ed>yYs-mA27loFeDlkAM=C1
z&hnBI%7l^#zT2Vvj?Kr<{GrGq{K=AUl#WplPTP1mB6bHK!LIdWX{uOElBzT!6eIN;
zt{Smr9$<YUcL%o%*u8zsag0B1xoGZT8nEVN%<_!?Z6@I6oMjjag8gpXKh69<yH*#y
z+R+b!z{jOIW_%`B4W%mXN4%b0^a`?Fdb6lau5;h>Cn*2zP&GwIr0?WMtMtz*J!+E6
znZqfhM{0jvAQujwgK>M(#jZo>dJ@3QmKD>kQy}cof^Xe^bon0(aFu&kyAGqhJlDCL
z6-ZeHfUTj3p4-g?E={nqYp!s(at=qntT0MTUvVQAPBrPYs_*>t7X$%)$1N#g*HztX
z9GeLs)v$j3l}e}q{d-01&`I;j>_Zbgu^)f<`sj@32phM<Hlfe~LkrE7lrkbx{`?9y
zh79-inqL;^$;Q$H?|NVO_0Gmw>G)7;qB`I+v2yywkb?M_<5w-w)98%EL2_~ICtyhe
zJ74>k@7=ktl>R=B4z1)9<R+k9{5lHv3v8WWrV<qXk%JfO*zz_ytn@={DvdnmW1L4p
zVIa#=d-G3kK!S8zC<?jxapGlRWNgOeBCJ<c6P}&vS~)T*OJFL-JEAe!Qw`+XTml<p
z-DXmk-fTKByc9Bd0}-Q79Q~WpgpatPl}542xb_3WK1ysY12dIAnMK4x41%OKuVI8k
zz5|8Ct+w1a8VK@h9)45IzY-)P${mC6Syf&#TZ0FwwXA9TMNRi<nI6%>X!-bY%Z+|>
z(dSJ$5NFAFUr)tQHK#D6SPZZ!fEuft8;b$W4Z#rCPUgW23}-jZCo2MD5-*{17g*UW
z%pUO9=4A8uRwOe2jWu$S8RCJ8ji|Sf>h*MyZ3l5*?8a%*pbZOS&i~6*PS88<Zj1H_
zBu>RF1}lmMj>m0n^^Vyz^_zm&l8G$HQ)o3*TP%23A0HK01((n40dH5|iZvWsPF5z*
z_LT=Oc~yv`@a^-#_FVv-+I+D|HX_njRrd^O$oCM18F~m#@G3e(sRLpiR6e7GM}kG(
zc$F(!?Vjv(whGpuespxGZtD(HLv#j=Gs%Y33GX#BI10vvb|M|B_@O{6|3>X%*%^0&
zaAJjECSFzk><W-Mq4}L`!Gu(h0pCEnya>9IoWivjeXnOI-dO8?;^3C`nXGRCJsccB
z|M#-DX$$Nsv#MMSmzJ>3%ENBQtUH08T&7bNR1fBcA_*1uM*T1R6oR@}sD&4;I$haJ
znk~O)e{Ka2&F_U>J#bi*mKm6D#(?Wiqj8-IxSAo|01t#~rn7l*<cIxSR>lbm_DSTu
zc)1+p=H%io3*FwnS$#iMYL$Aqi!B`cinO&3YwvZQK*OJ<E^ju;rW(8U5rm&`OlT~!
zQ6fgbxKVCko@Rp$Ru*WjOJ3WLSZneUTd3v}d<|9&DX?F)m8q_GBNOhYCevf@P~|G`
z<bwj;fjfSvuz~KS*?vPr)ZY42f(7SBv!o?S+DA+_grgT-$qvV&G|ZIMqSf-%owb#t
z-~o7CmAGnPBcIrm%&ARoeh9Rd8ko;))b)<&&}k{xEevv%rV@A-S385($^=b-lGD+y
zOz09EzGwU=gp|J0#-voZpv<d4=ZD_z<pHZ&O|dL$m}=B-rCoX1hlo!vdnL9#rNMTX
z+wEOeF+&EIP}??TkQm3~GZFC<@@fhHhc6a;6KXm8Y)SN7&T2WMo;XkjW14=0Kcz>F
zA$$5{qDq);RLvmSENp}%UR1S2vUir7#C7I7v%)bMr--`6tbeE>oe@VJ??gSmEnw^=
zyi?TLa3bw~mob&y*8pspkO-tO;Ul-VO9F_Vj`7G?VnD#Pyq<Hbj{Mt<V=Y#YpVOgb
zLS8*p#B=#XkhBBYM+u__A^e@cvp;JV$d*e^G5hz!DqH^|Pi8JYFjycqTufh825Yjy
z(j@3_$v1;3;$4`fRvA{iVux6O4dg9G^q}uNS>LMw46Ma<JE}4Bax3q7G>ETLt?epB
zi_HcPd0=G`e*_4A#6D4?jNVr|Q7a%R?RZ9oB3;_+=y6?lzwc`@Rgb(Dd|*njz`tVr
z7ynaO>SmGpx%xDfO~qke?}lZxufRT!6@0fyBFMC3<5p$7R!+Op-IWojPOiYV`-W>o
zr%7SDdB{Ve{|ULfqd7{46{=to!2XXwne>#gqGO6oIUA%J{n~7jtN6~VIMFgeuPOMP
z4%?fA9RvfN?JUY^U-pE!CkQ*SIDNHAB^8kJgi?hjFc<!YhPaelFdrXNB#V#?6jFEp
zF;Ij*Q^*=TR33dty37hhg;vJr3ufCKENxTs+H&hoMy-70gEgVc=9-X^cKiv0olGFp
zDNltl`Cro50a?ZW`i0Yg7QDo_Iu7JBOhX8_!`4pL)Mo?HeKzivWz*$5Dx+yGZa&@E
zWod5|!v~n7i15PTkxcRv41;bDm$K;j2{=$aRdma{jh~_bp@LI{Mf$^qH;f~DVI)Ne
zlVrmgc__gUs`gM?k<yDS5KiTkf~&TnDf%i)j|mFN9Nr}kEXy#|AvR=ELbt!bZ53KC
zBc%^s_Fs?B9C-OWkwMGOZ#`ZTxieY7CX21B_YYzXhF@u1yQTKOWxrJ)N53KVbhhzC
z2D!!f3wwanl=RuV!DzOq<1F{j#oh_{=3Ce8$6c`?S5wjjwl7O6gpf2VD^F;~vVsua
z>NVCkC1ce@TA!!7*t%3N>nZgl!?8o1syivK(T5r_l#5aMQ7#L0IMtnKvpOxlz#Ulb
z)&tJdIGf}s(_I0Yy#S^y{i03{$w-y?M?WiPNP&%G>yb{PnrPf}?$37jzcpB`5j+9`
z(gGuP2njeweXQlIP3#F`qUF;g@Sgip>gD#$Ab2EDA8VtHDY)W8?J93xNreBxe=shU
zam3<B!E8uJMN;4Bq4~~PS-SzOqYY{K9-3op(x|rO>{$P+knLsk{7e1#-lA{7LNf0w
z01v+;bJd&@g>(-SIbWOV$Lad=99<~u=t>fvI)!I46P?c$u)z#tMsSAXeg2bQL@JOg
zuSY{FhyRHA$ApKuWNkx&*q2|63-0lDMeODN5hq`~g9m#p(0@D?4?+ioJjbnqm!#uB
z(pjc1#~|mET92bzA(?QVVp+l&X>CO?@Znq0=3a2Jf9X?@_4aaxle&}F2J3`);f5Yk
zk~qClsJ~&t7$GW(!f@rL<WR)thc$I6F^rJ+_>m}*3W}n74~uQiwz@dGqrpL<-DJZw
zq&4teVqvNlYx30YA{i=u8FPM+{b`7~<8ypjze6^NiEo0xMpdSbP$I}0@c^7zip$^b
zv0AXb3KxtHjeydUf95xD`u6V6Vv`7nm&VYhZl%S&;-XevQFb0fBfMTu6AoKsJyMz4
zRI#50Xb4jw8zWlp<~C-ys=!AsDAN_k)dM@KI2IgKa?ACJm)02?Nb6wEfB32ROTuHG
z5@q5*_}La*-*Wgav4SWY6WBNn`?m6F9CxAXtM^D6!gsYRcruOOe7-CAngt>i_?HVf
zoD8Pc)#8O?-UO%qd;W~rQ1vnLKRF6+`?JXGeY3!qf#K7S9bJk4MS%8?jyY)1qyM7d
zKoy0oRwW_3Z|h)g1^P{<`;H<NZkQ!pfA9R7O)ix7{(PQ<tqV}Zbodo=Sx5VK`mA-#
z{$X_zP`&T@$_0z|kKT0hc26c#Rf{-?ZbdG3kMcMFewPjnETvILEb4Ji3G8tQ^iqYj
z^F81UjBIL5l0ab^$q60hp>XD_K>QJ?ZegoQ&=M>sNRobM_}g=YzbjI2GWjC)jhyWw
z&J3JC|0ua>91!zmUd!L)fg+!#uiZq$xnzknDY+NUUh=|JMPy_M7O+5S(WlAp1%qMh
zo++i%Qi7qauFB+@=XuXY;M<!3nvd`I)spww38;i185tSsImb)QL}X-S#P8AI>wLYv
z4oOMchqoaiIX{2?Y;^gOn~VDdY->-yX|z|g{51>*qCkzQ?*2@HF*XF(x{4tKo?vG-
z^UCJ4Dt(JPM#}x!h=SBzvm?}mb~q&2M<35Wu;=*Z&LA>sVT`2Z()84efrh5EDC(*o
zOU}*HJn$iv5Pc`ws-EY#k#3bh@aGR+<D0Q#ou|?1mpX|Al#sZ%IF-o9^ktP%0aJYc
zu$A<H#dja7Vxyu1zsEAi#Qq4L)$>G2d+)r;^2g}OQ;u}xgo2RE`Dc++CU>5pGpl^_
zf?-%M&S(?5+E}H6=UDXkUChl>D&bt_k6chzR#uW49<!dZqzHv|WWZ5R2t35O9_1ws
zM%Le}+MoVMJ$Fsp674*%T0$|(sRV(Oxl`Z{HdfL8$r8~fck|NABYGvxF(^}ERjeh3
zm`VT@Fw;lC<w2;aHp+Om2Hu|6-);nq=SN312l_$QcogK^QcOV}K)?N<WHCfD-Rq%`
zCIzyl*7(lBuJ3s`qREF?kf{gen#%`&?8aCvUeSlk{guy}%h^jCq3K1kBpcTN1b_Vc
zE4HoTE#AkRKdjIvM_N|`6lHj2MJms35ud*?{im!62-kFpA<5q5CoHjl)SE&Pgd$?O
zF!KH7{H%dZxmrDJl+#PZF&RFoV7>~deG2@yU&KA;OeZ5JzDbt~6N=>}_C*`Q<u`9R
zOKN6Bg^+>X=fOw0%uG}Q9>5M)-;Yzdg(p!;pPa{(h(0;LDWeN4%ua6jiT4?OJx^Kd
zzO=p7VwkWL4u+dkriKvoZ`}qOz6$p0JQtZCac9{P4G*X3W4vd`FZVk<>nsx111(ai
z?CY~v+7=e}of^$5VpfzGTCmqu1qpUWG029=eb(ZBC}A2YIkQ_U0kIh)9u}hWh7s5f
zQlA->GV?CH!!ALLb1xHmk%e7W#=wt*I_tZx`u(hx$D<`jgIBrF*w9K~DJuM;zn`;l
zOugf{Qy@oYZYSts*)LW;vTcePS|!<x(`G!H#5nTHUNXV}{b#sKz5$yJ*(b+8b61NR
z>H_EQE}6FqF!>H7O7|iMgHMyJl+RXNsGQPn1JL}<`V?i}hf7;w$zL14M<#F(jTC9I
z2QUh3@lc$9!>Tj!@rU+S*z8^8T-1mNx<y{>E=l53ynYX}4zrG9CwlK+)Gz+n&T*aP
zRX`MVb;a;~o8AX%CS6zc9!wTKdQ4(p5<ff?KJz<=KUbDORRFY&W-@78<rmh=g28A$
zWU6YoH%5Rls*XOFX&4*dWC(A~VUT5O&v0{d^F%44n0ezr_(M=~{3>OE&IJNtg1k^s
zH2B1XC#s3_FvspuW|r!ww49s>HX=UauA#E!P^6m5GBXAN7Cw$5`Li`DD9DO|y5&nJ
z0>~ij9!M5X$Ak!6@0bZLft}bB$e$9y`<9dOBrft9V!5Ag?=Hw*jN@bF<8IOMCM*0l
zK!dF#^|E(K$u188Zteq!bL&Nz0s1=UhU351_`eR<BqVsq6z>}Mfw22eYZjQwxd*p6
zB6s8v!4BhA#&6rO-?yv?q!+OMPi1Sl0b+Q+#EpHCj|W-%SVjR5s)wE%LpN;!P%xLO
z^{+6nN=Qr+07ZUK%iMyisWc~Z${Jj7{(P+$&aLPAF^DHAD)WVG%}8|%roDEquZSN0
z@;}~cPs(QyaP(*^zv4#3SpDACK_!QkP)uK}&@;uGnt2$N9Ldrv%Nu#oe8BWjhmT)U
z=YE84>1v->-uFBq?|WErS!D)qx>1A3*t4uSr&}3(415zQY8yh(nsD>@H~r}7s5Pj)
ze!zJ;<=8ks@#h)#S8liF=&z;Z%{Rtxv(AIWZuR%00e@2_3=qE#SjW9~b=6)<YMzYF
zh^0!h51E@dd9aVt;bW+O2!wI(xUg2<Mi*^vffE&?dh-1NeLv0VE69~0*5nO?9>tFX
zarK_MX|%G})%Q#lXV~8BgMb4%vn5bgj}O*S=(45wYDx6SQO9#<D_+WDgT3-_;wN1t
zN@K>Q9sZKCq%l#oJm8<z%6wIny@#$-Th8<JS2zcTVZllmh6P*z4XB!`N+*BL2%O)$
z%|Hy<-GjVaL0*<5&&8wVj>+94Nza++-O8+Nw=cs>hk-EQl(;#l7gD2Eklfpl@<eV`
z{chkna`OSci7(5MF2<qHcLSo8{=Zm;;9mVbyjkqX1QT8&ED+^0jt*||5}+eN-_U3h
z8j>S1xZ>Ct3Y;3>Q^Z=#md@K(C51*XlhiIOEEEc4++=`dPoSPPCL__`!?xCwLNI{~
zCV-@%U8RNfI99~oZ^9&HWMb6{K-)sZs~l=whL6<qnbRemq^5S-+3@MBuktRu;Tg>Z
z9rN4U+Y2{09lqU~e6UgD4ykqq+PGpyD_9q@Z!I4%R2j?Bz-P$(@2SfYJe8CjU?VA@
z`9qtGH-EaXVG<&@{8<U&57Ni>b=CMy1V65OU+_Y|G$2#=Olo&BzzjKZXo;wpeCs``
zBtaXGAY<Lbx%U7b^%%>!Fk+kxU>umH&M8g7j)s#6xwp5rc4W%&kyKaWI!g*^(2}|m
zz>yqVv9O4o%Idzyx{M|tY@4{sZ_g!ve{%4R!H#2k$kuhKFZU1kf$7ZQdg7WB_d&3n
zHVf`0tr}{r-RgYK2k86Lz1(meoRAk-c=%icdt6WIOAFg$2vfNn<HLWwkqI=3$G0@<
zO)6o7BSCPhIpRYc!HPZ{^7EVU#*X4Uz$KS{eZWEVRAbaGhSurjlDu^zx%Ou!397FZ
zXh_GtQ?zJKR}owaiJAl5I$nVTV07hsK4TwXGx!~=xBN~U`hMtQziIo5L2tr$t$c#d
z=FD`&NlTeT<)hzG;2r(;@S)Fu))be&qCyriqK{Ap+aA>BhscmC1Qgh8rz!xa0J7KF
zQbxB1aocvt{yhNI%m#DuOKD!9(zTsz@NIDsZr0FMPU&e4R1!x+<Dx4bUppx_?}wEx
zj$HKpI?p?;alRc~(s(w<V{B4ZiY-I5CRMi1F`<|5F4Rx`=FJ<37O@wokGD^c$@@$y
z+N7UKt4_TYW4Zd?9DA*W_5`fTZrkogVg}4CN*X&{BM&O}$JZU<DSuzNXgub~Nxw8}
z83XfnGCTm(eHIxp5+Ak1m_%g?g7ZkX_+Q0jXk(u?_+|3{`l-@(P(9_$cF!MJ(brhD
z*%*~^RLmBY|IJ138L29V8(AOz$CiG&kNbpQ1Ff0y%!uL&K95~c0GI+$hgs#}d~vak
z?*UqGNX~l<a?%~Uf6BYuvlksc;dk=TateqqrIJQ{{O91rNs#X>7?oopSh@aZBP^9T
zCGyW=<UzodKTJAtq>pUGY+R#?Gp&|^dNQF>Q)f#=9t;`M)BmyuW3LS@-NcQFv!Sue
z4q|wQY??w0dz1_ivamLctt)AE?FZ?Du?wiP%yDdy&oH?ZC-&trl$e|2NYwu={c5XY
zcyDC42uPZ%tBiia8+?D+RM?fz`zrj~?WX>NfxcOz-FL4@S(d+VUGccxb8yrzen`)k
z+I>S0Mqlb21=uW+;A4!apM%b><4nEpwF9YU-nQnXf&jlJULfbUrlP)yZfa37#-Z?3
zWoN>hwuzt854|n)T^KUJr>~!rp}`Sk8cUNSeN{ZC$MQ(xby=f(H1y+G>`Nydh75+M
zXW3SlY3z!YhpR%TZ-e-84>sXKnRq6Z1F3JgiK_=vXSxWTn1jce<$Wu0qQ4Q+i^9X?
zf>-Y>?Ewx^#%dyy&J5ftn!jc%tbxp?2Vm_IojJoa!Wwa?yN<9?sH^MvRLsPx_$iF-
z0bMtw_s&aerd#TU?4xOCqP??;x8ip&YQGHzTKA4r;LzjezdePPZ7p{12L632S<6^t
zxf%IvoBCQJRPbR|NR32H*T!UoPg>u7MO4{WGk|lq-Fk`hxt92ktQqM0s__Qoy4c^d
zw{(cE6S0^I0^t5QPx<0S))CepR%`7z*S7j~S*pkKhi64)Odg|QVic^-v289bc(E_O
z)h(6_*|l$5b3PWHE_5rb6O@gI!S>d0HLG22`UeMTruT`zAx0W3IX00dEI3`5Y#fhb
zn*fK8(S|cteYo9Et6hpBjs$Zf&I1xXd6cz%Ura35&8F`*l{5-k^ni}AYf7q0u;ws=
zh4sK(9_>`H^H9L7TUf;NjSKmevBUu;ve$&=Nj_5{$=3=$#dMN#qZ5N9khD4e_9m~M
z;{GTQreIb{Np?+gL8tz)te%A}b5Ernu<6%jRnmka=zF`|F|dqO!BnaOW@b}5Rbw&Q
z_-_@+)Cds+xsyt@yi@s8X-QPZO=~se5G;WGa}LCF-r8=<2Vys5tM7+aP6IgJ2`MNL
z<%OqEb?{*8h=@mLbc{Y{&QT-cjSc3;uIRTlL(n37$Mv*vxd6GEij|ZxCt&2?!pMte
zffp_L_I7oW{?_!}l7?y>k6LXXtrnBis;5rudEoxjM6+36<!Nqt-MX3Bp@z+fMsek_
zHxe6^6<o7?nL7_&U#%FzLBAg8#*zRXa3C<v9D<%L)vzbF8GTk?q)kJA+RCNHv3)Yl
zC2P;DrBIyEWw*ijmKK8;=;Qr~bT#dOhbtPAaw0HMb*yvF>$&f5?kt_!cMrrjQsa-O
zsw=fzubu7-JegD&Ow1W+(sivt`y|=AkOKjY=M>&NXo`^W*eKd))Dc#maWAc4=~v)I
ziR!s{eIIaYn%VZd;>}D6J?GNKoXwE>Jy`{MSel5Wga?_RPjmr9%t=qEFNqh4P&z>i
z-FXKbTm9~f65JIh+2{6kn*58NhX@{P9uyM6QcO5&e~aNkq7gJ%a?YmG67>}HTx^Sp
zbuce*QL2wF5u8zc&0BkPkRW)kHGsBf=#=rYY{GQMw={{&mp1=#+$w}oz!ah#?!H!!
zof;;@fB=C8E1(}So1Ym1kB)A<zxr>`($F0OS*z}9u8YDX5A(~(|C93a`%-KvAx+45
zaiE<5r(HueGM)Uhg=|fzaMbYESis{n>V4@OvtS(cndf~U5=G(&h;?*NF6EkT(*o=a
zahKTQV5d3Z{lmUpXv4dYN+g;+(u6^pJu%N1FyD{>)!>?RFe@M8T5`o(z7&kMzWJ))
zz$L1#jCO$u(mWV=+xdD6{OX(LxYfgtC)-nnYs-+L-h|dA*9VsS(E&@-hE#7TKQaw}
zIPyDug1Bh#Qrv!xQ)_P-5{|rpG$03#aSkN0^H!a9UoD5u{TlP0bIQ(kuq-;%UZ~nm
zrv$D#G=b@ca+;?7@7IBA^+}-dV(WRFaP<HPG7}*^a}rGi=QwiMUr7`g9{wuPv;k4G
zCLA#!`aOIhSNe`x#+@R$!R1sogc2b}HBH|EPQ_$aqH1DNW%-bOR9pI~{Bf+zoo<Kw
z*_&KktAkx98A-{=9+ouTf~+G8_XQ3h37dYTC4`SiDeAeQ>ga}H%(cOIu$&&zDJ_aR
zap>NmoB=MO?;*!FH}d=UmszL}{W*pU<}ZHNoUAMv(w!!qL>r&W!CWe>fd;|*DL9Xo
z(IZQ7{al_BW?3Rj#()6vru9-;zVt(y-3*H3UN@c0qpwPB42z_1T+pXJ29YYjY<GVj
z^M(~wAcyed^Y}P&`g=UXh~B2<X04n79gWW!x#M@_4FUI$3m|jUJ}b2c1}9I78JV+j
zec592$BP>jNL458bukiEjHMSFX(Qb9c<)hfOqD*dM@AEvsMb#g(G*Y>UeT9zh_}W&
z$=JykIu~fbQjJM=4*G0nzhjL6*<j<5*yc>2MXAH*#4q&qrjKwWbff~7*8P}mCCO1d
ziVN=}=j@iEhtAIrMV4$qA;|ZMn&iFdd|{unvu76fzd-t_Wnd4#&@em~nP*hQx0v{1
zjp}CMkn`*PB=HB+iZR0o0eW|ZP|3wa`A$M(qoZ+ql5=P{=&x~bTTBGTnA)p=YOlt5
z|BDw4^E{7!VnN(NdHBCbMYp(m+ZziU@Wr-<K@3glsXUhuv*i22(TyEe>2rn#ziY4=
zs6!3M)hogT{duGPSZ7<(lP_X(XphJ9`n$A3Su%cbHQmzR>JyHB9QRq?8H*TE@X7LA
z%{0#a&yQGkMnsAQXqdA+H4vW#0lzeVmuutVap_y0*^)&8H;o{LftYQbqQ3LyVkb_C
z9qM<Oi~oGTG)bkkgjy&srb31zHXA6X-f4GScC8a!J(1K1_R}tY7V;7`bvW1QyKA*#
z#F0lju5&JLn44JIR#v4z*Yu}3&(f2yYvon?)E|}vzOjob;Ps2`lT2)D5EQj0HQwpk
zA!2RXb`Y_W@#$<UI+MOuefh7lQ`|VZDiz3Lp7|~M(w`%ws&cZqA#NJme{N0QUAo*R
zg>Hua*}{DG@%6#WWF$^u_2<3MzjojAKQMaWT`LoiyVp82o2-7OzMMc1etCi)=1mq8
zW(xaHrtDV)@{3tii>av<KS4}Y;=lWN;5qbq(q9rXW6&xsJ_RL52Xx~t6)UPt&@MA#
z6eFu-c2+`zA^mrv4ufepy6-m>A^JF1%Vyk#-|d^ZnAnnek0WiwlTpdhXE7&?uW43n
zD%~HMm3(K<OL_J2;@EOQf%j6;fZ8ywjBe#UaqjClpcb%=llw^>^hp@KN@HVX8)wPe
za3y4OkP=s$g&g2qcWH~k9s4wjHFEv=bXVa}{HTaxBP`;3T8FW@!7fCgKK>M^>}8+O
zIWyiPtQzb;;(e=g5IA*@P^c56BGzRL)1SVFCA4|7i+3-K9aZo}iBkTyxvx%kJQ4*L
zB++LC;wJU-D}*S%jbBg0vRvvHiVlDLz`AC$Ibi6Y&lTy<iDLw4-L7r9h%}q!_CuZ{
zR?Qi@<yP<NzvyID{>*v9{G%s>C3fLLA<tjZH9<!^V~?XUV0B&ScrAa7;OwNwwRg|$
ztRCVT<pO<h!U}l~xiL9vhcTE8xCyRM50hyC(?Ht(_mMOaltwrow6|%)QT$Q4f!}oN
z`Uvn|2K!ppm4btazV+MCHji8LBN+`LGJDl@1TRtLrf*qZbEyK^)PaQv9d(S@t;X(S
z&j-Qg`fIIvd|Iz)Rkcm(5}YEaThb%L%6hs4CUU1$ddyAY13JSD$M-icuNM5R-aH&j
z;Sd%leDH@Ab*7K9VnE!Rrq~OM<4}Xv_YWy~!sNh!hwk7?Z<)W(=rhdJ*f5Nb5bQXh
z_3trhy~x8)>*x8hxS$Jt0<EljJLf@t@3e+YZIYm-`md<Sqy`UpToJB5I3WtiRmb_$
zt#GKvFmm_XgG7)dCTvrApe!UHtb*5~1LBjk`hZIC8T|&Qqn7z7*N<SD&R2cFl}hN*
z1u))Bz`|av`&LejR%t7Cj=Z51E_%_U$xXr$bQCrjFYOq8%3{nc_#y33%NMqaB-YcE
z^@+9_vQ%dN_&8XtSHd^kPF+pwbx`;WZ}JSb&8VDkB9q<(imqM`fu?bOy=RP)p1#(#
zlnm}E3!*AtCP{qHHl0-)%wztJNn~1h2}q}UNHi#ZNB6G<653UctMGG<?T%{%1CHYm
z5^`5>OcX-v#&;W>_QU8wZVQ!SArpzPM!{oYV%32@hOHW%IRrVx{rpeK!p!?zv?sH&
zZ20;t{q*)T;=IYb6|rVbjRR_@ZlBLvYj6e@Q|F>HM^;QD)zN}8>yFyL7v!%vqJX3C
z)n~3nx>0S&>5><Ti;+n*mYrNp3K>mUEQCmD<>fP$@#_8tByI_bf)TmPwU;~<UDN8b
zomKV4yDx|T^0{Dh@kfZ_Ac-LQHP9RjnhEG)^LG{q(YP4Sry>>1#f0z~C5LI4b^d+>
zL@Z)%=*+0xM;usrE4H$;NOMjMkU%7EFG;D$IavivK;i&9)LwM)q9b%Bj-szABoXZd
zu@LG=yLQT(#;WUdr9L<|{<7Xoh}QCcXhPN#qtx?{BAARuJ&ly!YW_ig#x!sW8Ve3Q
z`p{Y762*lr@4Fbxv+>u$QXTMi_XE@qR~!GEOOc<cc#h-xnqok7Aw@_`i^8vOE=J<E
z_e@;xTK&{w<8D?xc$p~WqZmJXuN9-T_aNnuHl|}n8k$zK8bEmwSoFM+R8v!HqC0RA
z7E?#dq-=;uv3Tz!aTl|*4)o0aH-huQtT10(Wbl`3{sFgVFAI_qfbJA|aT;9qUZ<xI
z(EKS-aT)@!3e9M7ezK5k(@%LP{sIG*GAhoYupKPDsnA8HF~S#Oa@c3H`0wx2bb;QD
zcEK<eKJg`ntFwHa?{wK;L7#U&W3g}Boxx%7bs6vQ>qKpp#|O)YDZ&zT7_}){63-qF
zq(8iZV^_-r6xOby2UD^nn1S@-r%d;{sQW5h^id8HL?Ujjy9%65ZQDLYjx7D%##d`R
zEcv%%)pyKw^CeG1xV%@AEYRxC`+JI+|Il*d(i0rkAYpz0inLVVV)T7P0sm;>-DUNc
zk)C1q?h{XMA9Y#zcP{<C>AmuLVZMCU#{AHjmV_*#oJ)s~*Dx+cMpBe2QLq+7vCjWc
z?6WS+BhtT(BdDFxoM|Z$k{md@W=&gDDK(OknEibzyOK-<An}%VD0&LpHoi|Gmtw>I
zk4#IEmD0qoihNM8JCHt4pOP%aNAxrZT_FHHWeW|8*k-xFOc|9D$F8>@&riX5$_cmz
zug#wAblk5*P$^u%iZyRL93--|>lJ>!(ZBj3I3bT2>a#z)cCb*7^eqk;Yo)@mLg<n=
zQrpx;MPq(CNI}FBSY%0gB<n{}Q^_Q4tG;bLk1!u!{nuNmd8XcJB;sb#r##ohbq%g3
z@}hz1@OssLJZE!UhM{U;l&;@|6`;)d@R~7Y>Dz~|RW9$cWpzyr!1SD*NPm$Ukph`@
zLT6*T7Y$v4>#JRZUxen+ymD3sB0vI-ZC`bf$YK;*;B7JX7YH(UK^kwki=bn?SH8+3
zEQl8qPS@Cz@TMPgF%iWj;ge$RA0I2=TL%Mx0^|=_?j<(lPg!{tCIkR~zXIv`EMETa
zqBb#@P$)KRx4YbBu#k*#sp}Ow{qjg3KaolE=5}RiQoUv_z~i%g<G`bM*n9>dXMv$v
zT&-^2@?*#nhI4vkGMh!X<~OFUk%&V((TjO4Na#W-<9g!VfhZ(Y;kqEVP)hR(Mg5Rx
zsWmEHT`_0z8wYfDs}tyh&Z7OPE`F&|DEI3U%jqyeI^3P?C+?mznnYrCn{^7!23r%_
z1LvlYp2}tps>ui{s~d~b_x}v7m)m@zpF3n4Iy<GGnnbNT&@Y`S<;XP<il?SvO3>x|
z?d}s-2Sb`5xwkW>H;Lv}5D5IJk4o^UeekonTkskj$|50i4y<nkq{<3%Z>19EDkmFt
z*q##e3#YL=Uo(U%>rInDy6MNI<O%<n@L9y0R7ilWudOsv;?dhvM0hYXz^1pga8a<~
z+7hCJ(ZU&%f6Rl9%^i=rl#R)6Cx7boLOSNgv?NRz%@OJafhI~0tx_P@0oMK6)2~FH
z)_0tcJNj&ZB%KqZW9oIT`K$X`{$@-F^!EkJtW~%4qU`y!egJ(H`G#BrSzmSRQ`^W5
zMg^OLeU#M$MH6gA;tQ-ji+WuMLESTt*K4KJQPX0`x%^vWVuF&b4oS$XqiH-Jte*7s
z^u&j^^6XEnZZO=U6w)`&qIpx<#$5(sTdc0Vk*Etmm;AOEL>+aOcqqa!=?CcHy>-=&
z`Q`duk5ftt`S8)9YsZuB$2mjB5V)lu$siT$ujo30UaQIWm&iBpT)s~UaQbJFbIHAD
zt(@|A1W45Mo3M-o{%YTe#?((YKChQ93b@)d<|3JFIcaQ&(!cW(P#_d=?w@r{W(Rt#
zs-l3ue>*g{kyE;pXd_z;kw?5&@~&iN9R~Gr@RX5=DpJ|mOpW669^`sMVX$o4EPBpY
z;PLiw4Nn)31jOIKe<fyoy*;j0|2MAzoP)LZ`8@i`yU@iCQ&j;Tu=Yzv#6|daT=OK{
z&x*?V6XvSRJG}Yf;o(%26(rl^E4i(QPCO7`CgB_amH7PgjbqTHvR?F5o6r6yOk2{T
zj>u>w=i)H(T8@-UybM{PfXYH`YY}GXulyZPjGi)oc4c)%YSKhC(T@7Z%$Bm;eMv^C
zH`hYoFAS7Vul4B#n{K;mO39%nj7G=H-{S1DuVxf)Htru`GPar7SGOJ8FpFjV<Qf6=
zzUCjQ+LG{o4}8x1K*ydfAt1U}q&F8q_27PdY~7ehBbZvQ=JN6shWh0|dFpP$EWLP{
z5q}vhPxQwtt~N+^tn{$Ch=j%k{_;js>)kh!1=}h1rtWe+s0sGBX|B7&Rl(~Sg`1_e
z3+T~ORDC-9=9cQ;-49$gb5QRJ`^X1OXh(3g92!)z{JhIxn`QS`eQ}aYkUyp$)#r$X
zjDAl(u;mPK*9;NBI~C45d^d4_@j5fYAUjsTU+_3~wSWtH8Xhwf3ybT-{4-q^oP+B5
z^9jZg_D!;>r&+njbU(~v{L!Ikvgelp?oCChH|9W<FT*XJK5t=@5k~#IQ=bN~Qf-ah
zBMzBW)Adf>l~N@^jc-=pZDqmDCsgZ*R&Jjy;f^MH{T*DzfVg&CDd5PhOtJ!0eYe9)
zUQZbc0Zi~Cp}8JU-xTPdnVTOuAz@px_5-U&*V^^h_R4>04T$0fWB8zun%m~4-viAl
z86>TfoIy~l)mq-a!qo1QWI&2s-o(K5Fxr8VvE*mt(DyUsNl5wOOPoI+;#tdnF1gK1
z)dk;;tS^o~U+?o!hv4&j8?&(B(W2^LB!bp6Sx&`!U%tr&500O``z44a&|iEi&v1dT
z)t0-5PpnsVA4=SPlCAa5K=3*!E9)uY^z}rI7M^$Mp_^~P`Ij&bfQ<W7f6<+==;29G
zOv=TxkJl8k!ue!&5rz~Duon7f`oI4OJu$4sf((|IbC6@P*1^b1s{CJa_Yu@S>RaH6
znZf$+yF<_!sZQ;6^ofK0|LtA$(*^P=xmLL7d;e(X`%3<cWKJXDz&Cg=ei00nvza%R
zLLeBy|LK+^JOK2CLa!}GB*&wdgpZh`^^#_<_b|me_=GpYNK#p~H2K#xxpS|`^Gqj5
zpD|GDO0lE6G{b3|NNJcbSRZbJdw{+(2)$7Kl#xTPw0GLH0T-V0Rgs1%I#R-E9k^mS
z=cki!)qZ{M=n#wnQnAW$w?5lb@GzE}4|tt_9h_z%r%SppBpt+JbtDL|Ixi6uuDSQQ
z{pnJDzps;sozn7*7dX43gFtlTE<7i&PC|T^+I?i-4dMk@v4_hF<r^hk%$R#4dfE=Z
zCk?0=Ku)_}J`Au{abY?xzu1vEzd4J9Sl_xd$3w1`8zUK?&qK%816DG#2FD)JJ@@Un
znab-ZQwG<Ef$Q^(-=q&@bs6$M$@^@@&iQXKw_-L8IJSCz--u)J*FcHcU+Iy9ab?2A
zoz->Y0|?w_y8w#T1qD&Is0MI{#9%`HzkjLIdyLh2ZkGYx>=_97_d-=$rAo>A-TwfS
C@^23S

delta 15921
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

diff --git a/data/extensions/aseprite-theme/dark/theme.xml b/data/extensions/aseprite-theme/dark/theme.xml
index 60acabbe1..112062391 100644
--- a/data/extensions/aseprite-theme/dark/theme.xml
+++ b/data/extensions/aseprite-theme/dark/theme.xml
@@ -7,7 +7,7 @@
     </authors>
     <fonts>
         <font id="default" font="Aseprite" />
-        <font id="mini" font="Aseprite Mini" />
+        <font id="mini" font="Aseprite Mini" mnemonics="off" />
     </fonts>
     <dimensions>
         <dim id="scrollbar_size" value="12" />
@@ -28,7 +28,7 @@
         <dim id="timeline_base_size" value="12" />
         <dim id="color_bar_buttons_height" value="16" />
         <dim id="context_bar_height" value="18" />
-        <dim id="brush_type_width" value="16" />
+        <dim id="brush_type_width" value="15" />
         <dim id="color_selector_bar_size" value="8" />
     </dimensions>
     <colors>
@@ -113,7 +113,6 @@
         <color id="flag_clicked" value="#41444a" />
         <color id="select_box_ruler" value="#0000ff" />
         <color id="select_box_grid" value="#64c864" />
-        <color id="edit_pal_face" value="#333333" />
         <color id="palette_entries_separator" value="#000000" />
     </colors>
     <parts>
@@ -184,18 +183,18 @@
         <part id="mini_slider_thumb_focused" x="48" y="176" w="5" h="4" />
         <part id="separator_horz" x="32" y="80" w="9" h="5" />
         <part id="separator_vert" x="32" y="96" w="5" h="9" />
-        <part id="combobox_arrow_down" x="100" y="148" w="9" h="9" />
-        <part id="combobox_arrow_down_selected" x="116" y="148" w="9" h="9" />
-        <part id="combobox_arrow_down_disabled" x="132" y="148" w="9" h="9" />
-        <part id="combobox_arrow_up" x="100" y="163" w="9" h="9" />
-        <part id="combobox_arrow_up_selected" x="116" y="163" w="9" h="9" />
-        <part id="combobox_arrow_up_disabled" x="132" y="163" w="9" h="9" />
-        <part id="combobox_arrow_left" x="99" y="180" w="9" h="9" />
-        <part id="combobox_arrow_left_selected" x="115" y="180" w="9" h="9" />
-        <part id="combobox_arrow_left_disabled" x="131" y="180" w="9" h="9" />
-        <part id="combobox_arrow_right" x="99" y="196" w="9" h="9" />
-        <part id="combobox_arrow_right_selected" x="115" y="196" w="9" h="9" />
-        <part id="combobox_arrow_right_disabled" x="131" y="196" w="9" h="9" />
+        <part id="combobox_arrow_down" x="100" y="148" w="9" h="8" />
+        <part id="combobox_arrow_down_selected" x="116" y="148" w="9" h="8" />
+        <part id="combobox_arrow_down_disabled" x="132" y="148" w="9" h="8" />
+        <part id="combobox_arrow_up" x="100" y="163" w="9" h="8" />
+        <part id="combobox_arrow_up_selected" x="116" y="163" w="9" h="8" />
+        <part id="combobox_arrow_up_disabled" x="132" y="163" w="9" h="8" />
+        <part id="combobox_arrow_left" x="99" y="180" w="9" h="8" />
+        <part id="combobox_arrow_left_selected" x="115" y="180" w="9" h="8" />
+        <part id="combobox_arrow_left_disabled" x="131" y="180" w="9" h="8" />
+        <part id="combobox_arrow_right" x="99" y="196" w="9" h="8" />
+        <part id="combobox_arrow_right_selected" x="115" y="196" w="9" h="8" />
+        <part id="combobox_arrow_right_disabled" x="131" y="196" w="9" h="8" />
         <part id="arrow_circle_cw" x="99" y="243" w="10" h="10" />
         <part id="arrow_circle_cw_selected" x="115" y="243" w="10" h="10" />
         <part id="newfolder" x="99" y="211" w="9" h="9" />
@@ -207,11 +206,12 @@
         <part id="toolbutton_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
         <part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
-        <part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
+        <part id="buttonset_item_normal" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_hot" x="112" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_hot_focused" x="128" y="0" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_focused" x="128" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
+        <part id="buttonset_item_active" x="112" y="32" w1="3" w2="10" w3="3" h1="3" h2="8" h3="5" />
         <part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
         <part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
@@ -425,10 +425,10 @@
         <part id="folder_icon_small" x="144" y="272" w="10" h="8" />
         <part id="folder_icon_big" x="176" y="272" w="32" h="32" />
         <part id="folder_icon_medium" x="160" y="272" w="16" h="16" />
-        <part id="outline_circle" x="144" y="224" w="13" h="15" />
-        <part id="outline_square" x="160" y="224" w="13" h="15" />
-        <part id="outline_horizontal" x="176" y="224" w="13" h="15" />
-        <part id="outline_vertical" x="192" y="224" w="13" h="15" />
+        <part id="outline_circle" x="144" y="226" w="13" h="13" />
+        <part id="outline_square" x="160" y="226" w="13" h="13" />
+        <part id="outline_horizontal" x="176" y="226" w="13" h="13" />
+        <part id="outline_vertical" x="192" y="226" w="13" h="13" />
         <part id="outline_empty_pixel" x="208" y="224" w="5" h="5" />
         <part id="outline_full_pixel" x="214" y="224" w="5" h="5" />
         <part id="dynamics" x="176" y="144" w="16" h="16" />
@@ -615,7 +615,7 @@
             <icon part="radio_selected" align="left middle" x="2" state="selected" />
             <icon part="radio_disabled" align="left middle" x="2" state="disabled" />
         </style>
-        <style id="mini_button">
+        <style id="mini_button" padding-top="1" border="3" border-bottom="5">
             <background-border part="buttonset_item_normal" />
             <background-border part="buttonset_item_hot" state="mouse" />
             <background-border part="buttonset_item_hot" state="focus" />
@@ -625,7 +625,7 @@
             <text color="button_selected_text" state="selected" />
         </style>
         <style id="mini_check_box" extends="check_box" font="mini" />
-        <style id="combobox_button" extends="mini_button">
+        <style id="combobox_button" extends="mini_button" padding="0">
             <icon part="combobox_arrow_down" />
             <icon part="combobox_arrow_down_selected" state="selected" />
             <icon part="combobox_arrow_down_disabled" state="disabled" />
@@ -645,17 +645,17 @@
             <icon part="combobox_arrow_down_selected" state="selected" />
             <icon part="combobox_arrow_down_disabled" state="disabled" />
         </style>
-        <style id="go_back_button" extends="mini_button">
+        <style id="go_back_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_left" />
             <icon part="combobox_arrow_left_selected" state="selected" />
             <icon part="combobox_arrow_left_disabled" state="disabled" />
         </style>
-        <style id="go_forward_button" extends="mini_button">
+        <style id="go_forward_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_right" />
             <icon part="combobox_arrow_right_selected" state="selected" />
             <icon part="combobox_arrow_right_disabled" state="disabled" />
         </style>
-        <style id="go_up_button" extends="mini_button">
+        <style id="go_up_button" extends="mini_button" padding-top="2">
             <icon part="combobox_arrow_up" />
             <icon part="combobox_arrow_up_selected" state="selected" />
             <icon part="combobox_arrow_up_disabled" state="disabled" />
@@ -664,7 +664,7 @@
             <icon part="arrow_circle_cw" />
             <icon part="arrow_circle_cw_selected" state="selected" />
         </style>
-        <style id="new_folder_button" extends="mini_button">
+        <style id="new_folder_button" extends="mini_button" padding-top="2">
             <icon part="newfolder" />
             <icon part="newfolder_selected" state="selected" />
         </style>
@@ -1018,10 +1018,109 @@
             <text color="slider_empty_text" align="center middle" />
             <text color="slider_empty_text" align="center middle" state="focus" y="1" />
         </style>
-        <style id="mini_slider" extends="slider" font="mini" padding-top="1" padding-bottom="3">
+        <style id="mini_slider" extends="slider" font="mini">
             <background part="mini_slider_empty" />
             <text color="slider_empty_text" align="center middle" />
             <text color="slider_empty_text" align="center middle" state="focus" />
         </style>
+        <style id="buttonset" gap-rows="-3" gap-columns="-1" />
+        <style id="buttonset_item" font="mini" border="3" border-bottom="5">
+            <background-border part="buttonset_item_normal" />
+            <background-border part="buttonset_item_hot" state="selected" />
+            <background-border part="buttonset_item_hot" state="mouse" />
+            <background-border part="buttonset_item_hot_focused" state="selected focus" />
+            <background-border part="buttonset_item_hot_focused" state="mouse focus" />
+            <background-border part="buttonset_item_pushed" state="capture selected" />
+            <background-border part="buttonset_item_pushed" state="mouse capture" />
+            <background-border part="buttonset_item_focused" state="focus" />
+        </style>
+        <style id="buttonset_item_icon" extends="buttonset_item">
+            <icon />
+            <icon state="disabled" color="disabled" />
+            <icon state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="buttonset_item_icon_mono" extends="buttonset_item_icon">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="buttonset_item_text" extends="buttonset_item" padding="1">
+            <text color="button_normal_text" />
+            <text color="button_hot_text" state="selected" />
+            <text color="button_hot_text" state="mouse" />
+            <text color="button_selected_text" state="mouse capture" />
+            <text color="button_selected_text" state="capture selected" />
+            <text color="background" x="1" y="1" state="disabled" />
+            <newlayer />
+            <text color="disabled" state="disabled" align="top" />
+        </style>
+        <style id="buttonset_item_text_top" extends="buttonset_item">
+            <text color="button_normal_text" align="top" />
+            <text color="button_hot_text" state="selected" align="top" />
+            <text color="button_hot_text" state="mouse" align="top" />
+            <text color="button_selected_text" state="mouse capture" align="top" />
+            <text color="button_selected_text" state="capture selected" align="top" />
+            <text color="background" x="1" y="1" state="disabled" align="top" />
+            <newlayer />
+            <text color="disabled" state="disabled" align="top" />
+        </style>
+        <style id="buttonset_item_text_top_icon_bottom" extends="buttonset_item_text_top" padding-top="2" padding-bottom="1">
+            <icon align="bottom" />
+            <icon align="bottom" state="disabled" color="disabled" />
+            <icon align="bottom" state="capture selected" color="button_selected_text" />
+        </style>
+        <style id="new_sprite_rgb" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="new_sprite_grayscale" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="new_sprite_indexed" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_transparent" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_white" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="bg_black" extends="buttonset_item_text_top_icon_bottom" />
+        <style id="dir_item" extends="buttonset_item_icon" width="18" height="20" />
+        <style id="context_bar_button" extends="buttonset_item_icon" width="15" />
+        <style id="context_bar_text_button" extends="buttonset_item_text" width="15" />
+        <style id="brush_type" extends="context_bar_button" />
+        <style id="brush_type_mono" extends="context_bar_button">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="ink_type" extends="context_bar_button" padding-left="1" />
+        <style id="dynamics_field" extends="context_bar_button" padding-left="1" />
+        <style id="pivot_field" extends="context_bar_button" padding-top="1" />
+        <style id="pivot_dir" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="selection_mode" extends="context_bar_button" padding-top="1" />
+        <style id="symmetry_field" extends="context_bar_button" padding-top="1" />
+        <style id="symmetry_options" extends="context_bar_text_button" padding-left="3" padding-bottom="3" />
+        <style id="pal_edit_lock" extends="buttonset_item_icon" width="15">
+            <icon part="timeline_closed_padlock_normal" />
+            <icon part="timeline_closed_padlock_normal" state="capture selected" />
+        </style>
+        <style id="pal_edit_unlock" extends="pal_edit_lock">
+            <background-border part="buttonset_item_active" />
+            <background-border part="buttonset_item_active" state="selected" />
+            <background-border part="buttonset_item_active" state="focus" />
+            <background-border part="buttonset_item_active" state="mouse" />
+            <background-border part="buttonset_item_active" state="mouse focus" />
+            <background-border part="buttonset_item_active" state="capture" />
+            <background-border part="buttonset_item_active" state="capture selected" />
+            <newlayer />
+            <icon part="timeline_open_padlock_active" />
+        </style>
+        <style id="pal_button" extends="buttonset_item_icon" minwidth="15" padding-top="1" />
+        <style id="debugger_button" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="edit_pixels_mode" extends="buttonset_item_icon" width="15">
+            <icon color="button_normal_text" />
+        </style>
+        <style id="edit_tiles_mode" extends="edit_pixels_mode" width="15">
+            <background-border part="buttonset_item_active" />
+            <background-border part="buttonset_item_active" state="selected" />
+            <background-border part="buttonset_item_active" state="focus" />
+            <background-border part="buttonset_item_active" state="mouse" />
+            <background-border part="buttonset_item_active" state="mouse focus" />
+            <background-border part="buttonset_item_active" state="capture" />
+            <background-border part="buttonset_item_active" state="capture selected" />
+            <newlayer />
+            <icon color="button_selected_text" />
+        </style>
+        <style id="standard_brush" extends="buttonset_item_icon_mono" width="17" height="19" />
+        <style id="outline_cell" extends="buttonset_item_icon" width="17" height="19" />
+        <style id="ani_button" extends="buttonset_item_icon" width="17" />
+        <style id="multi_window_item" extends="buttonset_item_icon" width="17" height="17" />
     </styles>
 </theme>

From 0ae8bc9b1051de628568b8d7dfae5778569dca6b Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Tue, 28 Feb 2023 14:28:09 -0300
Subject: [PATCH 31/31] Improve backward compatibility with old themes

We have to copy all missing <style> into the new theme, so these
styles are re-loaded using colors and parts from the new
theme (instead of using the data of the default theme).
---
 src/app/ui/skin/skin_theme.cpp | 111 +++++++++++++++++++++++----------
 src/app/ui/skin/skin_theme.h   |   4 +-
 2 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index a0b9e15e6..aef0eaa9e 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019-2022  Igara Studio S.A.
+// Copyright (C) 2019-2023  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -44,6 +44,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <memory>
 
 #define BGCOLOR                 (getWidgetBgColor(widget))
 
@@ -56,37 +57,76 @@ using namespace ui;
 // TODO For backward compatibility, in future versions we should remove this (extensions are preferred)
 const char* SkinTheme::kThemesFolderName = "themes";
 
-// This class offer backward compatibility with old themes, completing
-// or changing styles from the default theme to match the default
-// theme of previous versions, so third-party themes can look like
-// they are running in the old Aseprite without any modification.
-struct app::skin::SkinTheme::BackwardCompatibility {
-  bool hasSliderStyle = false;
-  void notifyStyleExistence(const char* styleId) {
-    if (std::strcmp(styleId, "slider") == 0)
-      hasSliderStyle = true;
+// Offers backward compatibility with old themes, copying missing
+// styles (raw XML <style> elements) from the default theme to the
+// current theme. This must be done so all <style> elements in the new
+// theme use colors and parts from the new theme instead of the
+// default one (as when they were loaded).
+class app::skin::SkinTheme::BackwardCompatibility {
+
+  enum class State {
+    // When we are loading the default theme
+    LoadingStyles,
+    // When we are loading the selected theme (so we must copy missing
+    // styles from the previously loaded default theme)
+    CopyingStyles,
+  };
+
+  State m_state = State::LoadingStyles;
+
+  // Loaded XML <style> element from the original theme (cloned
+  // elements).  Must be in order to insert them in the same order in
+  // the selected theme.
+  std::vector<std::unique_ptr<TiXmlElement>> m_styles;
+
+public:
+  void copyingStyles() {
+    m_state = State::CopyingStyles;
   }
-  void createMissingStyles(SkinTheme* theme) {
-    if (!hasSliderStyle &&
-        theme->styles.slider() &&
-        theme->styles.miniSlider()) {
-      // Old slider style
-      ui::Style style(nullptr);
-      os::Font* font = theme->getDefaultFont();
-      const int h = font->height();
 
-      style.setId(theme->styles.slider()->id());
-      style.setFont(AddRef(font));
+  // Called for each <style> element found in theme.xml.
+  void onStyle(TiXmlElement* xmlStyle) {
+    // Loading <style> from the default theme
+    if (m_state == State::LoadingStyles)
+      m_styles.emplace_back((TiXmlElement*)xmlStyle->Clone());
+  }
 
-      auto part = theme->parts.sliderEmpty();
-      style.setBorder(
-        gfx::Border(part->bitmapW()->width()-1*guiscale(),
-                    part->bitmapN()->height()+h/2,
-                    part->bitmapE()->width()-1*guiscale(),
-                    part->bitmapS()->height()-1*guiscale()+h/2));
+  void removeExistentStyles(TiXmlElement* xmlStyle) {
+    if (m_state != State::CopyingStyles)
+      return;
 
-      *theme->styles.slider() = style;
-      *theme->styles.miniSlider() = style;
+    while (xmlStyle) {
+      const char* s = xmlStyle->Attribute("id");
+      if (!s)
+        break;
+      std::string styleId = s;
+
+      // Remove any existent style in the selected theme.
+      auto it = std::find_if(m_styles.begin(),
+                             m_styles.end(),
+                             [styleId](auto& style){
+                               return (style->Attribute("id") == styleId);
+                             });
+      if (it != m_styles.end())
+        m_styles.erase(it);
+
+      xmlStyle = xmlStyle->NextSiblingElement();
+    }
+  }
+
+  // Copies all missing <style> elements to the new theme. xmlStyles
+  // is the <styles> element from the theme.xml of the selected theme
+  // (non the default one).
+  void copyMissingStyles(TiXmlNode* xmlStyles) {
+    if (m_state != State::CopyingStyles)
+      return;
+
+    for (auto& style : m_styles) {
+      LOG(VERBOSE, "THEME: Copying <style id='%s'> from default theme\n",
+          style->Attribute("id"));
+
+      // InsertEndChild() clones the node
+      xmlStyles->InsertEndChild(*style.get());
     }
   }
 };
@@ -265,15 +305,16 @@ SkinTheme::~SkinTheme()
 void SkinTheme::onRegenerateTheme()
 {
   Preferences& pref = Preferences::instance();
+  BackwardCompatibility backward;
 
   // First we load the skin from default theme, which is more proper
   // to have every single needed skin part/color/dimension.
-  loadAll(pref.theme.selected.defaultValue());
+  loadAll(pref.theme.selected.defaultValue(), &backward);
 
   // Then we load the selected theme to redefine default theme parts.
   if (pref.theme.selected.defaultValue() != pref.theme.selected()) {
     try {
-      BackwardCompatibility backward;
+      backward.copyingStyles();
       loadAll(pref.theme.selected(), &backward);
     }
     catch (const std::exception& e) {
@@ -554,6 +595,11 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
     if (!xmlStyle)              // Without styles?
       throw base::Exception("There are no styles");
 
+    if (backward) {
+      backward->removeExistentStyles(xmlStyle);
+      backward->copyMissingStyles(xmlStyle->Parent());
+    }
+
     while (xmlStyle) {
       const char* style_id = xmlStyle->Attribute("id");
       if (!style_id) {
@@ -567,7 +613,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
         base = m_styles[extends_id];
 
       if (backward)
-        backward->notifyStyleExistence(style_id);
+        backward->onStyle(xmlStyle);
 
       ui::Style* style = m_styles[style_id];
       if (!style) {
@@ -798,9 +844,6 @@ void SkinTheme::loadXml(BackwardCompatibility* backward)
     }
   }
 
-  if (backward)
-    backward->createMissingStyles(this);
-
   ThemeFile<SkinTheme>::updateInternals();
 }
 
diff --git a/src/app/ui/skin/skin_theme.h b/src/app/ui/skin/skin_theme.h
index 48e7edb77..4062ed066 100644
--- a/src/app/ui/skin/skin_theme.h
+++ b/src/app/ui/skin/skin_theme.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2023  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -141,7 +141,7 @@ namespace app {
       void onRegenerateTheme() override;
 
     private:
-      struct BackwardCompatibility;
+      class BackwardCompatibility;
 
       void loadFontData();
       void loadAll(const std::string& themeId,