diff --git a/libs/builder.lua b/libs/builder.lua
index d7ecae7..04d8c91 100644
--- a/libs/builder.lua
+++ b/libs/builder.lua
@@ -68,7 +68,7 @@ return function(description,opts)
                     (struct.vertical and "vertical") or
                     "horizontal"
                 )],
-                spacing = style.spacing
+                spacing = style.spacing or struct.spacing
             }
             for _,v in pairs(struct.list) do
                 if v.draggable then
@@ -89,18 +89,18 @@ return function(description,opts)
             local list = {
                 {
                     layout = wibox.layout.fixed[orient],
-                    spacing = style.spacing
+                    spacing = style.spacing or struct.spacing
                 },{
                     layout = wibox.layout.flex[orient],
-                    spacing = style.spacing
+                    spacing = style.spacing or struct.spacing
                 },{
                     -- Simulating "spacing" parameter
                     widget = builtins[(struct.vertical and "v_spacer") or
                         "h_spacer"]({size = style.spacing}),
                     layout = wibox.layout.fixed[orient],
-                    spacing = style.spacing
+                    spacing = style.spacing or struct.spacing
                 },
-                layout = wibox.layout.align[orient]
+                layout = wibox.layout.align[orient],
             }
             for k,v in pairs({"left","center","right"}) do
                 for _,obj in pairs(struct.align[v]) do
diff --git a/themes/serenity/COPYING.txt b/themes/serenity/COPYING.txt
new file mode 100644
index 0000000..0e259d4
--- /dev/null
+++ b/themes/serenity/COPYING.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/themes/serenity/config/client_menu.json b/themes/serenity/config/client_menu.json
new file mode 100644
index 0000000..deb50dc
--- /dev/null
+++ b/themes/serenity/config/client_menu.json
@@ -0,0 +1,8 @@
+{
+    "list": [
+        {"widget": "widgets.clientmenu.volume","vertical":false},
+        {"widget": "widgets.clientmenu.controls"},
+        {"widget": "widgets.clientmenu.buttons"}
+    ],
+    "vertical":true
+}
diff --git a/themes/serenity/config/global.json b/themes/serenity/config/global.json
new file mode 100644
index 0000000..dab1382
--- /dev/null
+++ b/themes/serenity/config/global.json
@@ -0,0 +1,9 @@
+{
+    "widgets.dismal":{
+        "x":0,
+        "y":26
+    },
+    "widgets.rootmenu":{},
+    "widgets.lockscreen":{},
+    "widgets.base.keypopup":{}
+}
diff --git a/themes/serenity/config/lockpanel.json b/themes/serenity/config/lockpanel.json
new file mode 100644
index 0000000..9c8ee56
--- /dev/null
+++ b/themes/serenity/config/lockpanel.json
@@ -0,0 +1,5 @@
+{
+    "widgets.lock.clock":{
+        "format": "%a %b %d\n %H: %M"
+    }   
+}
diff --git a/themes/serenity/config/root_menu.json b/themes/serenity/config/root_menu.json
new file mode 100644
index 0000000..fb21811
--- /dev/null
+++ b/themes/serenity/config/root_menu.json
@@ -0,0 +1,29 @@
+{
+    "list": [
+        {"widget": "widgets.base.popuptitle",
+            "options":{
+                "icon":"icons/reno98.png",
+                "title":"Serenity"
+            },
+            "vertical":true
+        },
+        { 
+            "list": [
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootmenu.controls"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                },
+                {"widget": "widgets.rootmenu.buttons"}
+            ],
+            "vertical": true
+        }
+    ],
+    "vertical": false
+}
diff --git a/themes/serenity/config/titlebar_top.json b/themes/serenity/config/titlebar_top.json
new file mode 100644
index 0000000..5aedd1c
--- /dev/null
+++ b/themes/serenity/config/titlebar_top.json
@@ -0,0 +1,44 @@
+{ 
+"align": {
+    "left": [
+        {
+            "widget":"widgets.clientmenu",
+            "client":true
+        }
+    ],
+    "center": [
+        {
+            "list":[
+                {
+                    "draggable": true
+                },
+                {
+                    "builtin": "titlewidget",
+                    "client" : true,
+                    "options": {
+                        "align": "left"
+                    }
+                },
+                { 
+                    "widget":"widgets.base.separator", 
+                    "vertical":true
+                }
+            ]
+        }
+    ],
+    "right": [
+        {
+            "builtin": "minimizebutton",
+            "client": true
+        },
+        {
+            "builtin": "maximizedbutton",
+            "client": true
+        },
+        {
+            "builtin": "closebutton",
+            "client": true
+        }
+    ]
+}
+}  
diff --git a/themes/serenity/config/wibar_bottom.json b/themes/serenity/config/wibar_bottom.json
new file mode 100644
index 0000000..1b707a8
--- /dev/null
+++ b/themes/serenity/config/wibar_bottom.json
@@ -0,0 +1,18 @@
+{ 
+    "align": {
+        "left": [
+            {
+                "widget": "widgets.desktop.tasklist",
+                "screen": true
+            }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            {
+                "widget": "widgets.desktop.launcher"
+            }
+        ]
+    }
+}  
diff --git a/themes/serenity/config/wibar_top.json b/themes/serenity/config/wibar_top.json
new file mode 100644
index 0000000..a19cb1c
--- /dev/null
+++ b/themes/serenity/config/wibar_top.json
@@ -0,0 +1,25 @@
+{ 
+    "align": {
+        "left": [ 
+            { "widget": "widgets.desktop.soundclown" }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            { "widget":"widgets.desktop.volume" },
+            { "widget": "widgets.desktop.notifications",
+                "screen": true
+            },
+            { "widget": "widgets.desktop.wallpapers",
+                "screen": true,
+                "options": {
+                    "path": "$HOME/Pictures/Wallpapers"
+                }
+            },
+            { "widget": "widgets.desktop.battery" },
+            { "widget": "widgets.base.systray" },
+            { "widget": "widgets.base.clock" }
+        ]
+    }
+}  
diff --git a/themes/serenity/icons/README b/themes/serenity/icons/README
new file mode 100644
index 0000000..7023132
--- /dev/null
+++ b/themes/serenity/icons/README
@@ -0,0 +1,3 @@
+Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
+
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons
diff --git a/themes/serenity/icons/ac-adapter-symbolic.png b/themes/serenity/icons/ac-adapter-symbolic.png
new file mode 100644
index 0000000..cdf53b7
Binary files /dev/null and b/themes/serenity/icons/ac-adapter-symbolic.png differ
diff --git a/themes/serenity/icons/action-lock-screen-symbolic.png b/themes/serenity/icons/action-lock-screen-symbolic.png
new file mode 100644
index 0000000..cc3cdab
Binary files /dev/null and b/themes/serenity/icons/action-lock-screen-symbolic.png differ
diff --git a/themes/serenity/icons/action-poweroff-symbolic.png b/themes/serenity/icons/action-poweroff-symbolic.png
new file mode 100644
index 0000000..94be34c
Binary files /dev/null and b/themes/serenity/icons/action-poweroff-symbolic.png differ
diff --git a/themes/serenity/icons/action-suspend-symbolic.png b/themes/serenity/icons/action-suspend-symbolic.png
new file mode 100644
index 0000000..1000808
Binary files /dev/null and b/themes/serenity/icons/action-suspend-symbolic.png differ
diff --git a/themes/serenity/icons/backlight-symbolic.png b/themes/serenity/icons/backlight-symbolic.png
new file mode 100644
index 0000000..828f571
Binary files /dev/null and b/themes/serenity/icons/backlight-symbolic.png differ
diff --git a/themes/serenity/icons/battery-caution-charging-symbolic.png b/themes/serenity/icons/battery-caution-charging-symbolic.png
new file mode 100644
index 0000000..be0746b
Binary files /dev/null and b/themes/serenity/icons/battery-caution-charging-symbolic.png differ
diff --git a/themes/serenity/icons/battery-caution-symbolic.png b/themes/serenity/icons/battery-caution-symbolic.png
new file mode 100644
index 0000000..25e3572
Binary files /dev/null and b/themes/serenity/icons/battery-caution-symbolic.png differ
diff --git a/themes/serenity/icons/battery-empty-charging-symbolic.png b/themes/serenity/icons/battery-empty-charging-symbolic.png
new file mode 100644
index 0000000..6628ab9
Binary files /dev/null and b/themes/serenity/icons/battery-empty-charging-symbolic.png differ
diff --git a/themes/serenity/icons/battery-empty-symbolic.png b/themes/serenity/icons/battery-empty-symbolic.png
new file mode 100644
index 0000000..7b88252
Binary files /dev/null and b/themes/serenity/icons/battery-empty-symbolic.png differ
diff --git a/themes/serenity/icons/battery-full-charged-symbolic.png b/themes/serenity/icons/battery-full-charged-symbolic.png
new file mode 100644
index 0000000..4735283
Binary files /dev/null and b/themes/serenity/icons/battery-full-charged-symbolic.png differ
diff --git a/themes/serenity/icons/battery-full-charging-symbolic.png b/themes/serenity/icons/battery-full-charging-symbolic.png
new file mode 100644
index 0000000..c299736
Binary files /dev/null and b/themes/serenity/icons/battery-full-charging-symbolic.png differ
diff --git a/themes/serenity/icons/battery-full-symbolic.png b/themes/serenity/icons/battery-full-symbolic.png
new file mode 100644
index 0000000..4735283
Binary files /dev/null and b/themes/serenity/icons/battery-full-symbolic.png differ
diff --git a/themes/serenity/icons/battery-good-charging-symbolic.png b/themes/serenity/icons/battery-good-charging-symbolic.png
new file mode 100644
index 0000000..364fc94
Binary files /dev/null and b/themes/serenity/icons/battery-good-charging-symbolic.png differ
diff --git a/themes/serenity/icons/battery-good-symbolic.png b/themes/serenity/icons/battery-good-symbolic.png
new file mode 100644
index 0000000..c9edfb0
Binary files /dev/null and b/themes/serenity/icons/battery-good-symbolic.png differ
diff --git a/themes/serenity/icons/battery-low-charging-symbolic.png b/themes/serenity/icons/battery-low-charging-symbolic.png
new file mode 100644
index 0000000..f1a7544
Binary files /dev/null and b/themes/serenity/icons/battery-low-charging-symbolic.png differ
diff --git a/themes/serenity/icons/battery-low-symbolic.png b/themes/serenity/icons/battery-low-symbolic.png
new file mode 100644
index 0000000..5f26e83
Binary files /dev/null and b/themes/serenity/icons/battery-low-symbolic.png differ
diff --git a/themes/serenity/icons/battery-missing-symbolic.png b/themes/serenity/icons/battery-missing-symbolic.png
new file mode 100644
index 0000000..37d01b3
Binary files /dev/null and b/themes/serenity/icons/battery-missing-symbolic.png differ
diff --git a/themes/serenity/icons/battery.png b/themes/serenity/icons/battery.png
new file mode 100644
index 0000000..4735283
Binary files /dev/null and b/themes/serenity/icons/battery.png differ
diff --git a/themes/serenity/icons/mpc-next-symbolic.png b/themes/serenity/icons/mpc-next-symbolic.png
new file mode 100644
index 0000000..8d94bc7
Binary files /dev/null and b/themes/serenity/icons/mpc-next-symbolic.png differ
diff --git a/themes/serenity/icons/mpc-pause-symbolic.png b/themes/serenity/icons/mpc-pause-symbolic.png
new file mode 100644
index 0000000..8e8a97f
Binary files /dev/null and b/themes/serenity/icons/mpc-pause-symbolic.png differ
diff --git a/themes/serenity/icons/mpc-play-symbolic.png b/themes/serenity/icons/mpc-play-symbolic.png
new file mode 100644
index 0000000..5a1cfaf
Binary files /dev/null and b/themes/serenity/icons/mpc-play-symbolic.png differ
diff --git a/themes/serenity/icons/mpc-previous-symbolic.png b/themes/serenity/icons/mpc-previous-symbolic.png
new file mode 100644
index 0000000..73120bf
Binary files /dev/null and b/themes/serenity/icons/mpc-previous-symbolic.png differ
diff --git a/themes/serenity/icons/notifications-area-symbolic.png b/themes/serenity/icons/notifications-area-symbolic.png
new file mode 100644
index 0000000..ceb0578
Binary files /dev/null and b/themes/serenity/icons/notifications-area-symbolic.png differ
diff --git a/themes/serenity/icons/reno98.png b/themes/serenity/icons/reno98.png
new file mode 100644
index 0000000..b1e98ef
Binary files /dev/null and b/themes/serenity/icons/reno98.png differ
diff --git a/themes/serenity/icons/unknown-app.png b/themes/serenity/icons/unknown-app.png
new file mode 100644
index 0000000..0d0f8bd
Binary files /dev/null and b/themes/serenity/icons/unknown-app.png differ
diff --git a/themes/serenity/icons/wallpapers.png b/themes/serenity/icons/wallpapers.png
new file mode 100644
index 0000000..49e84e7
Binary files /dev/null and b/themes/serenity/icons/wallpapers.png differ
diff --git a/themes/serenity/layouts/cornerne.png b/themes/serenity/layouts/cornerne.png
new file mode 100644
index 0000000..c85bd56
Binary files /dev/null and b/themes/serenity/layouts/cornerne.png differ
diff --git a/themes/serenity/layouts/cornernew.png b/themes/serenity/layouts/cornernew.png
new file mode 100644
index 0000000..c3fd986
Binary files /dev/null and b/themes/serenity/layouts/cornernew.png differ
diff --git a/themes/serenity/layouts/cornernw.png b/themes/serenity/layouts/cornernw.png
new file mode 100644
index 0000000..dfe78b3
Binary files /dev/null and b/themes/serenity/layouts/cornernw.png differ
diff --git a/themes/serenity/layouts/cornernww.png b/themes/serenity/layouts/cornernww.png
new file mode 100644
index 0000000..f489010
Binary files /dev/null and b/themes/serenity/layouts/cornernww.png differ
diff --git a/themes/serenity/layouts/cornerse.png b/themes/serenity/layouts/cornerse.png
new file mode 100644
index 0000000..023ae79
Binary files /dev/null and b/themes/serenity/layouts/cornerse.png differ
diff --git a/themes/serenity/layouts/cornersew.png b/themes/serenity/layouts/cornersew.png
new file mode 100644
index 0000000..f7cfa1c
Binary files /dev/null and b/themes/serenity/layouts/cornersew.png differ
diff --git a/themes/serenity/layouts/cornersw.png b/themes/serenity/layouts/cornersw.png
new file mode 100644
index 0000000..c1453c9
Binary files /dev/null and b/themes/serenity/layouts/cornersw.png differ
diff --git a/themes/serenity/layouts/cornersww.png b/themes/serenity/layouts/cornersww.png
new file mode 100644
index 0000000..a65a043
Binary files /dev/null and b/themes/serenity/layouts/cornersww.png differ
diff --git a/themes/serenity/layouts/dwindle.png b/themes/serenity/layouts/dwindle.png
new file mode 100644
index 0000000..9902d22
Binary files /dev/null and b/themes/serenity/layouts/dwindle.png differ
diff --git a/themes/serenity/layouts/dwindlew.png b/themes/serenity/layouts/dwindlew.png
new file mode 100644
index 0000000..9199049
Binary files /dev/null and b/themes/serenity/layouts/dwindlew.png differ
diff --git a/themes/serenity/layouts/fairh.png b/themes/serenity/layouts/fairh.png
new file mode 100644
index 0000000..d41deea
Binary files /dev/null and b/themes/serenity/layouts/fairh.png differ
diff --git a/themes/serenity/layouts/fairhw.png b/themes/serenity/layouts/fairhw.png
new file mode 100644
index 0000000..bb50e3a
Binary files /dev/null and b/themes/serenity/layouts/fairhw.png differ
diff --git a/themes/serenity/layouts/fairv.png b/themes/serenity/layouts/fairv.png
new file mode 100644
index 0000000..f5f0288
Binary files /dev/null and b/themes/serenity/layouts/fairv.png differ
diff --git a/themes/serenity/layouts/fairvw.png b/themes/serenity/layouts/fairvw.png
new file mode 100644
index 0000000..4f4ed52
Binary files /dev/null and b/themes/serenity/layouts/fairvw.png differ
diff --git a/themes/serenity/layouts/floating.png b/themes/serenity/layouts/floating.png
new file mode 100644
index 0000000..b8061a0
Binary files /dev/null and b/themes/serenity/layouts/floating.png differ
diff --git a/themes/serenity/layouts/floatingw.png b/themes/serenity/layouts/floatingw.png
new file mode 100644
index 0000000..4815894
Binary files /dev/null and b/themes/serenity/layouts/floatingw.png differ
diff --git a/themes/serenity/layouts/fullscreen.png b/themes/serenity/layouts/fullscreen.png
new file mode 100644
index 0000000..d02f6fc
Binary files /dev/null and b/themes/serenity/layouts/fullscreen.png differ
diff --git a/themes/serenity/layouts/fullscreenw.png b/themes/serenity/layouts/fullscreenw.png
new file mode 100644
index 0000000..5c35bfa
Binary files /dev/null and b/themes/serenity/layouts/fullscreenw.png differ
diff --git a/themes/serenity/layouts/magnifier.png b/themes/serenity/layouts/magnifier.png
new file mode 100644
index 0000000..2925414
Binary files /dev/null and b/themes/serenity/layouts/magnifier.png differ
diff --git a/themes/serenity/layouts/magnifierw.png b/themes/serenity/layouts/magnifierw.png
new file mode 100644
index 0000000..6209556
Binary files /dev/null and b/themes/serenity/layouts/magnifierw.png differ
diff --git a/themes/serenity/layouts/max.png b/themes/serenity/layouts/max.png
new file mode 100644
index 0000000..8d20844
Binary files /dev/null and b/themes/serenity/layouts/max.png differ
diff --git a/themes/serenity/layouts/maxw.png b/themes/serenity/layouts/maxw.png
new file mode 100644
index 0000000..85f5ce3
Binary files /dev/null and b/themes/serenity/layouts/maxw.png differ
diff --git a/themes/serenity/layouts/spiral.png b/themes/serenity/layouts/spiral.png
new file mode 100644
index 0000000..d9434be
Binary files /dev/null and b/themes/serenity/layouts/spiral.png differ
diff --git a/themes/serenity/layouts/spiralw.png b/themes/serenity/layouts/spiralw.png
new file mode 100644
index 0000000..b78dd86
Binary files /dev/null and b/themes/serenity/layouts/spiralw.png differ
diff --git a/themes/serenity/layouts/tile.png b/themes/serenity/layouts/tile.png
new file mode 100644
index 0000000..3ede21e
Binary files /dev/null and b/themes/serenity/layouts/tile.png differ
diff --git a/themes/serenity/layouts/tilebottom.png b/themes/serenity/layouts/tilebottom.png
new file mode 100644
index 0000000..6f8c257
Binary files /dev/null and b/themes/serenity/layouts/tilebottom.png differ
diff --git a/themes/serenity/layouts/tilebottomw.png b/themes/serenity/layouts/tilebottomw.png
new file mode 100644
index 0000000..a1de7b2
Binary files /dev/null and b/themes/serenity/layouts/tilebottomw.png differ
diff --git a/themes/serenity/layouts/tileleft.png b/themes/serenity/layouts/tileleft.png
new file mode 100644
index 0000000..31d6870
Binary files /dev/null and b/themes/serenity/layouts/tileleft.png differ
diff --git a/themes/serenity/layouts/tileleftw.png b/themes/serenity/layouts/tileleftw.png
new file mode 100644
index 0000000..cf14c25
Binary files /dev/null and b/themes/serenity/layouts/tileleftw.png differ
diff --git a/themes/serenity/layouts/tiletop.png b/themes/serenity/layouts/tiletop.png
new file mode 100644
index 0000000..98cade2
Binary files /dev/null and b/themes/serenity/layouts/tiletop.png differ
diff --git a/themes/serenity/layouts/tiletopw.png b/themes/serenity/layouts/tiletopw.png
new file mode 100644
index 0000000..d1d0872
Binary files /dev/null and b/themes/serenity/layouts/tiletopw.png differ
diff --git a/themes/serenity/layouts/tilew.png b/themes/serenity/layouts/tilew.png
new file mode 100644
index 0000000..fde2ca4
Binary files /dev/null and b/themes/serenity/layouts/tilew.png differ
diff --git a/themes/serenity/submenu.png b/themes/serenity/submenu.png
new file mode 100644
index 0000000..b2778e2
Binary files /dev/null and b/themes/serenity/submenu.png differ
diff --git a/themes/serenity/taglist/squarefw.png b/themes/serenity/taglist/squarefw.png
new file mode 100644
index 0000000..2a86430
Binary files /dev/null and b/themes/serenity/taglist/squarefw.png differ
diff --git a/themes/serenity/taglist/squarew.png b/themes/serenity/taglist/squarew.png
new file mode 100644
index 0000000..913f2ca
Binary files /dev/null and b/themes/serenity/taglist/squarew.png differ
diff --git a/themes/serenity/theme.lua b/themes/serenity/theme.lua
new file mode 100644
index 0000000..0e48369
--- /dev/null
+++ b/themes/serenity/theme.lua
@@ -0,0 +1,737 @@
+-- Reno98 - a retro replica of a very recognizable theme
+--[[
+    Reno98 - A theme for Reno desktop
+
+    Written in 2022 by Yessiest (yessiest@memeware.net)
+
+    To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
+
+    You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
+--]]
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+local gears = require("gears")
+
+local gfs = require("gears.filesystem")
+local themes_path = root_path.."/themes/"
+
+local theme = {}
+
+theme.font          = "Terminus 8"
+
+theme.bg_normal     = "#c0c0c0"
+theme.bg_focus      = "#D6D3CE"
+theme.bg_urgent     = "#FFEDCC"
+theme.bg_minimize   = "#efefef"
+theme.bg_highlight  = "#D6D3CE"
+theme.bg_highlight_shadow = "#404040FF"
+theme.bg_highlight_light = "#FFFFFFFF"
+theme.bg_highlight_outline = "#808080FF"
+theme.bg_systray    = theme.bg_normal
+
+theme.fg_normal     = "#000000"
+theme.fg_focus      = "#000000"
+theme.fg_urgent     = "#000000"
+theme.fg_minimize   = "#000000"
+
+theme.useless_gap   = dpi(0)
+-- technically speaking these are irrelevant since they're not exactly smart
+-- borders
+theme.titlebar_bg_accent_normal_1 = "#808080"
+theme.titlebar_bg_accent_normal_2 = "#c0c0c0"
+theme.titlebar_bg_accent_focus_1 = "#632210"
+theme.titlebar_bg_accent_focus_2 = "#b47856"
+
+theme.border_width  = 0
+theme.border_normal = "#c0c0c0"
+theme.border_focus  = "#c0c0c0"
+theme.border_marked = "#c0c0c0"
+theme.window_rounding = 0
+
+theme.titlebar_bg_focus = {
+  type = "linear",
+  from = { 0, 0 },
+  to = { 640, 0 },
+  stops = { {0, "#632210"}, {1, "#fed8b1"} }
+}
+
+theme.titlebar_bg_normal = {
+  type = "linear",
+  from = { 0, 0 },
+  to = { 640, 0 },
+  stops = { {0, "#828282"}, {1, "#AFAFAF"} }
+}
+local taglist_square_size = dpi(4)
+theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
+    taglist_square_size, theme.fg_normal
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+    taglist_square_size, theme.fg_normal
+)
+theme.menu_height = dpi(15)
+theme.menu_width  = dpi(100)
+theme.systray_icon_spacing = 2
+
+-- Define the image to load
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."serenity/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."serenity/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."serenity/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."serenity/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."serenity/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."serenity/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."serenity/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."serenity/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."serenity/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."serenity/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."serenity/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."serenity/titlebar/floating_focus_active.png"
+
+theme = theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal")
+theme = theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus")
+
+theme.titlebar_close_button_normal = themes_path.."serenity/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."serenity/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."serenity/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."serenity/titlebar/minimize_focus.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."serenity/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."serenity/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."serenity/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."serenity/titlebar/maximized_focus_active.png"
+
+theme.wallpaper = themes_path.."serenity/background.png"
+theme.wallpapers_icon = themes_path.."serenity/icons/wallpapers.png"
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = themes_path.."serenity/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."serenity/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."serenity/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."serenity/layouts/magnifierw.png"
+theme.layout_max = themes_path.."serenity/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."serenity/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."serenity/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."serenity/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."serenity/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."serenity/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."serenity/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."serenity/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."serenity/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."serenity/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."serenity/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."serenity/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+theme.awesome_icon = theme_assets.awesome_icon(
+    theme.menu_height, theme.bg_focus, theme.fg_focus
+)
+
+theme.hotkeys_border_width = 3
+theme.hotkeys_border_color = theme.bg_focus
+theme.hotkeys_modifiers_fg = theme.fg_normal
+theme.hotkeys_label_fg = theme.fg_normal
+
+theme.bgimage_outset = function(context, cr, width, height,...)
+    local light = gears.color(theme.bg_highlight_light)
+    local shadow = gears.color(theme.bg_highlight_shadow)
+    local outline = gears.color(theme.bg_highlight_outline)
+    -- Background
+
+    -- Light
+    cr:set_source(light)
+    cr.line_width=2
+    cr:move_to(0,0)
+    cr:line_to(width,0)
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:stroke()
+
+    -- Outline
+    cr:set_source(outline)
+    cr:move_to(width-1,height-1)
+    cr:line_to(width-1,1)
+    cr:move_to(width-2,height-1)
+    cr:line_to(1,height-1)
+    cr:stroke()
+
+    -- Shadow
+    cr:set_source(shadow)
+    cr:move_to(width,height)
+    cr:line_to(width,0)
+    cr:move_to(width-1,height)
+    cr:line_to(0,height)
+    cr:stroke()
+end
+
+theme.bgimage_inset = function(context,cr,width,height)
+    local light = gears.color(theme.bg_highlight_light)
+    local shadow = gears.color(theme.bg_highlight_shadow)
+    local outline = gears.color(theme.bg_highlight_outline)
+
+    -- Light
+    cr:set_source(light)
+    cr.line_width=2
+    cr:move_to(width,height)
+    cr:line_to(width,0)
+    cr:move_to(width,height)
+    cr:line_to(0,height)
+    cr:stroke()
+    
+    -- Shadow
+    cr:set_source(shadow)
+    cr.line_width=2
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:move_to(0,0)
+    cr:line_to(width,0)
+    cr:stroke()
+end
+
+theme.bgimage_highlight = function(context,cr,width,height)
+    local light = gears.color(theme.bg_highlight_light)
+    local shadow = gears.color(theme.bg_highlight_shadow)
+    local outline = gears.color(theme.bg_highlight_outline)
+    
+    -- Light
+    cr:set_source(light)
+    cr.line_width=2
+    cr:move_to(1,1)
+    cr:line_to(1,height-2)
+    cr:move_to(1,1)
+    cr:line_to(width-2,1)
+    cr:stroke()
+ 
+    -- Outline
+    cr:set_source(outline)
+    cr.line_width=2
+    cr:rectangle(0,0,width-1,height-1)
+    cr:stroke()
+
+    -- Light (bottom)
+    cr:set_source(light)
+    cr:move_to(width,height)
+    cr:line_to(width,0)
+    cr:move_to(width,height)
+    cr:line_to(0,height)
+    cr:stroke()
+end
+
+theme.wibar_bgimage_top = function(context, cr, width, height,...)
+    local shadow = gears.color(theme.bg_highlight_shadow)
+    local outline = gears.color(theme.bg_highlight_outline)
+    -- Background
+
+    -- Outline
+    cr:set_source(outline)
+    cr:move_to(0,height-1)
+    cr:line_to(width,height-1)
+    cr:stroke()
+
+    -- Shadow
+    cr:set_source(shadow)
+    cr:move_to(0,height)
+    cr:line_to(width,height)
+    cr:stroke()
+end
+
+theme.wibar_bgimage_bottom = function(context, cr, width, height,...)
+    local light = gears.color(theme.bg_highlight_light)
+    -- Background
+
+    -- Light
+    cr:set_source(light)
+    cr.line_width=2
+    cr:move_to(0,0)
+    cr:line_to(width,0)
+    cr:stroke()
+end
+
+-- A complex piece of "code" to simulate borders.
+theme.titlebar_bgimage_top_focus = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_focus_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_focus_2)
+    cr.line_width = 2
+    cr:set_source(outer_line)
+    cr:move_to(1,height)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(inner_line)
+    cr:move_to(1,1)
+    cr:line_to(1,height)
+    cr:move_to(1,1)
+    cr:line_to(width-1,1)
+    cr:move_to(width-1,1)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:move_to(0,0)
+    cr:line_to(width,0)
+    cr:move_to(width,0)
+    cr:line_to(width,height)
+    cr:stroke()
+end
+theme.titlebar_bgimage_bottom_focus = function(context, cr, width, height, ...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_focus_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_focus_2)
+    cr.line_width = 2
+    cr:set_source(inner_line)
+    cr:move_to(1,height-1)
+    cr:line_to(width-1,height-1)
+    cr:move_to(1,height-1)
+    cr:line_to(1,0)
+    cr:move_to(width-1,height-1)
+    cr:line_to(width-1,0)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,height)
+    cr:line_to(width,height)
+    cr:move_to(0,height)
+    cr:line_to(0,0)
+    cr:move_to(width,height)
+    cr:line_to(width,0)
+    cr:stroke()
+end
+theme.titlebar_bgimage_left_focus = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_focus_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_focus_2)
+    cr.line_width = 2
+    cr:set_source(inner_line)
+    cr:move_to(1,0)
+    cr:line_to(1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:stroke()
+end
+theme.titlebar_bgimage_right_focus = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_focus_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_focus_2)
+    cr.line_width=2
+    cr:set_source(inner_line)
+    cr:move_to(width-1,0)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(width,0)
+    cr:line_to(width,height)
+    cr:stroke()
+end
+theme.titlebar_bgimage_top_normal = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_normal_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_normal_2)
+    cr.line_width = 2
+    cr:set_source(outer_line)
+    cr:move_to(1,height)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(inner_line)
+    cr:move_to(1,1)
+    cr:line_to(1,height)
+    cr:move_to(1,1)
+    cr:line_to(width-1,1)
+    cr:move_to(width-1,1)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:move_to(0,0)
+    cr:line_to(width,0)
+    cr:move_to(width,0)
+    cr:line_to(width,height)
+    cr:stroke()
+end
+theme.titlebar_bgimage_bottom_normal = function(context, cr, width, height, ...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_normal_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_normal_2)
+    cr.line_width = 2
+    cr:set_source(inner_line)
+    cr:move_to(1,height-1)
+    cr:line_to(width-1,height-1)
+    cr:move_to(1,height-1)
+    cr:line_to(1,0)
+    cr:move_to(width-1,height-1)
+    cr:line_to(width-1,0)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,height)
+    cr:line_to(width,height)
+    cr:move_to(0,height)
+    cr:line_to(0,0)
+    cr:move_to(width,height)
+    cr:line_to(width,0)
+    cr:stroke()
+end
+theme.titlebar_bgimage_left_normal = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_normal_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_normal_2)
+    cr.line_width = 2
+    cr:set_source(inner_line)
+    cr:move_to(1,0)
+    cr:line_to(1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(0,0)
+    cr:line_to(0,height)
+    cr:stroke()
+end
+theme.titlebar_bgimage_right_normal = function(context, cr, width, height,...)
+    local outer_line = gears.color(theme.titlebar_bg_accent_normal_1)
+    local inner_line = gears.color(theme.titlebar_bg_accent_normal_2)
+    cr.line_width=2
+    cr:set_source(inner_line)
+    cr:move_to(width-1,0)
+    cr:line_to(width-1,height)
+    cr:stroke()
+
+    cr:set_source(outer_line)
+    cr:move_to(width,0)
+    cr:line_to(width,height)
+    cr:stroke()
+end
+---theme.bgimage_outset
+-- Define the icon theme for application icons. If not set then the icons
+-- from /usr/share/icons and /usr/share/icons/hicolor will be used.
+theme.icon_theme = "Chicago95"
+
+-- Icons
+local icons = {
+    "battery-caution-charging-symbolic",
+    "battery-empty-charging-symbolic",
+    "battery-full-charging-symbolic",
+    "battery-good-charging-symbolic",
+    "battery-low-charging-symbolic"
+}
+for _,v in pairs(icons) do
+    theme[v] = themes_path.."serenity/icons/"..v..".png"
+    theme[v:gsub("-charging","")] = themes_path.."serenity/icons/"..v:gsub("-charging","")..".png"
+end
+theme["battery-full-charged-symbolic"] = themes_path.."serenity/icons/battery-full-charged-symbolic.png"
+theme["battery-missing-symbolic"] = themes_path.."serenity/icons/battery-missing-symbolic.png"
+theme["ac-adapter-symbolic"] = themes_path.."serenity/icons/ac-adapter-symbolic.png"
+theme["backlight-symbolic"] = themes_path.."serenity/icons/backlight-symbolic.png"
+theme["notifications-area-symbolic"] = themes_path.."serenity/icons/notifications-area-symbolic.png"
+
+theme["mpc-previous-symbolic"] = themes_path.."serenity/icons/mpc-previous-symbolic.png"
+
+theme["mpc-play-symbolic"] = themes_path.."serenity/icons/mpc-play-symbolic.png"
+theme["mpc-pause-symbolic"] = themes_path.."serenity/icons/mpc-pause-symbolic.png"
+theme["mpc-next-symbolic"] = themes_path.."serenity/icons/mpc-next-symbolic.png"
+
+theme["action-poweroff-symbolic"] = themes_path.."serenity/icons/action-poweroff-symbolic.png"
+theme["action-lock-screen-symbolic"] = themes_path.."serenity/icons/action-lock-screen-symbolic.png"
+theme["action-suspend-symbolic"] = themes_path.."serenity/icons/action-suspend-symbolic.png"
+-- Notification popups settings
+theme.notification_width = 240
+theme.notification_height = 60
+
+-- Default icon for clients
+-- This one has to be baked as a surface to avoid memory leaks
+theme.icon_default = gears.surface(themes_path.."serenity/icons/unknown-app.png")
+
+theme.widgets = {
+    -- {{{ Widget base
+    default = {
+        container = {
+            bgimage_normal = theme.bgimage_highlight,
+            shape = function(cr,width,height)
+                return require("gears").shape.rounded_rect(cr,width,height,0)
+            end,
+            bgimage_highlight = theme.bgimage_inset
+        },
+        button = {
+            bgimage_normal = theme.bgimage_outset,
+            shape = function(cr,width,height)
+                return require("gears").shape.rounded_rect(cr,width,height,0)
+            end,
+            onpress = function(widget)
+                widget:set_bg(theme.bg_focus)
+                widget:set_bgimage(theme.bgimage_inset)
+            end,
+            onrelease = function(widget)
+                widget:set_bg(theme.bg_normal)
+                widget:set_bgimage(theme.bgimage_outset)
+            end
+        },
+        popup = {
+            bgimage_normal = theme.bgimage_outset,
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,0)
+            end,
+        },
+        titlebar = {
+            hidden_size = 2,
+            bgimage_normal = theme.bgimage_outset,
+            --margins = 5,
+            left = 4,
+            right = 5,
+            top = 4,
+            bottom = 3,
+            spacing = 1
+        },
+        wibar = {
+            height = 26,
+            width = 60,
+            margins = 3,
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,0)
+            end,
+            bgimage_normal = theme.bgimage_outset,
+            stretch = true
+        },
+        slider = {
+            shape = function(cr,width,height)
+                return gears.shape.rounded_rect(cr,width,height,0)
+            end,
+            height = 20,
+            width = 140,
+            handle_width = 8,
+            handle_border_color = theme.bg_focus,
+            handle_border_width = 2,
+            bar_height = 6
+        }
+    },
+    -- }}}
+    -- {{{ Menus
+    generic_menu = {
+        base = {
+            spacing = 2,
+            menu_slide = true
+        },
+        button = {
+            forced_height = 20,
+            forced_width = 160
+        },
+    },
+    --}}}
+    -- {{{ Bars/Panels/Menu popups
+    generic_composite_widget = {
+        base = {
+            spacing = 2
+        }
+    },
+    generic_iconified_widget = {
+        button = {
+            margins = 0,
+            bgimage_normal = function() end,
+            bgimage_focus = function() end,
+            onpress = function() end,
+            onrelease = function() end
+        }
+    },
+    -- }}}
+    -- {{{ Status panel widgets
+    generic_status_widget = {
+        container = {
+            bgimage_normal = function() end,
+            margins = 0
+        },
+        button = {
+            margins = 0,
+            onpress = function() end,
+            onrelease = function() end,
+            bgimage_normal = function() end
+        }
+    },
+    -- }}}
+    -- {{{ Various button lists
+    generic_button_list = {
+        button = {
+            forced_width = 20,
+            forced_height = 20
+        },
+        base = {
+            spacing = 2
+        }
+    },
+    -- }}}
+    -- {{{ All widgets that fit into a single line
+    generic_oneline_widget = {
+        container = {
+            bgimage_normal = theme.bgimage_inset
+        },
+        button = {
+            margins = 0,
+            bgimage_normal = function() end,
+            bgimage_focus = function() end,
+            onpress = function() end,
+            onrelease = function() end
+        }
+    },
+    -- }}}
+    -- {{{ All kinds of widget popups
+    generic_popup = {
+        button = {
+            width = 180,
+            height = 40
+        },
+        article = {
+            icon_size = 30
+        },
+    },
+    -- }}}
+    popuptitle = {
+        container = {
+            bg_normal = {
+                type = "linear",
+                from = { 0, 0 },
+                to = { 90, 0 },
+                stops = { {0, "#632210"}, {1, "#fed8b1"} }
+            },
+            -- awesomewm: yo pass me that pango markup
+            -- pango: you better not make unintuitive cryptic shit
+            -- awesomewm: *attach foreground setting to drawable container*
+            fg_normal = "#FAFAFA"
+        }
+    },
+    soundclown = {
+        --[[ --Uncomment to leetify that MPC
+        container = {
+            bg_normal = "#0c0c0c",
+            fg_normal = "#00FF00"
+        },
+        ]]
+        base = {
+            width = 140,
+        },
+        container = {
+            margins = 1
+        }
+    },
+    subpanel = {
+        container = {
+            bgimage_normal = theme.bgimage_inset,
+            margins = 2
+        }
+    },
+    separator = {
+        container = {
+            bgimage_normal = function(context, cr, width, height)
+                local bar_color = gears.color("#00000070")
+                cr.line_width = 1
+                cr:set_source(bar_color)
+                for i = 0,math.floor(height/2) do
+                    cr:move_to(3,(i*2)+0.5)
+                    cr:line_to(width-3,(i*2)+0.5)
+                end
+                cr:stroke()
+            end,
+            margins = 2,
+            bg_normal = "#00000000"
+        },
+        separator = {
+            color = "#30303000"
+        }
+    },
+    taglist = {
+        base = {
+            spacing = 2,
+            layout = require("wibox").layout.flex.horizontal
+        },
+        button = {
+            margins = 2,
+            bgimage_focus = theme.bgimage_inset,
+            bgimage_normal = theme.bgimage_outset,
+        },
+        container = {
+            margins = 3
+        }
+    },
+    tasklist = {
+        button = {
+            width = 160,
+            height = 50,
+            margins = 2,
+            bgimage_focus = theme.bgimage_inset,
+            bgimage_normal = theme.bgimage_outset,
+            bgimage_urgent = theme.bgimage_outset,
+            bgimage_minimize = theme.bgimage_outset
+        }
+    },
+    lockscreen = {
+        popup = {
+            margins = 0
+        }
+    },
+    lockbar = {
+        base = {
+            height = 22
+        }
+    },
+    lockpanel = {
+        base = {
+            icon_height = 60,
+            icon_width = 60,
+            panel_height = 300,
+            panel_width = 200,
+            panel_bgimage = theme.bgimage_outset
+        }
+    },
+    lock_clock = {
+        textbox = {
+            font = "Terminus 20"
+        }
+    },
+    titlebar = {
+        titlebar_top = {
+            bgimage_normal = theme.titlebar_bgimage_top_normal,
+            bgimage_focus = theme.titlebar_bgimage_top_focus,
+            bg_focus = theme.titlebar_bg_focus,
+            bg_normal = theme.titlebar_bg_normal,
+            fg_focus = "#FAFAFA",
+            fg_normal = theme.fg_normal,
+            size = 22,
+        },
+        titlebar_left = {
+            bgimage_normal = theme.titlebar_bgimage_left_normal,
+            bgimage_focus = theme.titlebar_bgimage_left_focus,
+            size = 3,
+            bg_focus = theme.titlebar_bg_accent_focus_1,
+            bg_normal = theme.titlebar_bg_accent_normal_1
+        },
+        titlebar_right = {
+            bgimage_normal = theme.titlebar_bgimage_right_normal,
+            bgimage_focus = theme.titlebar_bgimage_right_focus,
+            size = 3,
+            bg_focus = theme.titlebar_bg_accent_focus_1,
+            bg_normal = theme.titlebar_bg_accent_normal_1
+        },
+        titlebar_bottom = {
+            bgimage_normal = theme.titlebar_bgimage_bottom_normal,
+            bgimage_focus = theme.titlebar_bgimage_bottom_focus,
+            size = 3,
+            bg_focus = theme.titlebar_bg_accent_focus_1,
+            bg_normal = theme.titlebar_bg_accent_normal_1
+        }
+    },
+    wibar = {
+        wibar_top = {
+            height = 22,
+            bgimage_normal = theme.wibar_bgimage_top,
+        },
+        wibar_bottom = {
+            height = 26,
+            bgimage_normal = theme.wibar_bgimage_bottom
+        }
+    }
+}
+
+return theme
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/themes/serenity/titlebar/close_focus.png b/themes/serenity/titlebar/close_focus.png
new file mode 100644
index 0000000..9640cd5
Binary files /dev/null and b/themes/serenity/titlebar/close_focus.png differ
diff --git a/themes/serenity/titlebar/close_normal.png b/themes/serenity/titlebar/close_normal.png
new file mode 100644
index 0000000..9640cd5
Binary files /dev/null and b/themes/serenity/titlebar/close_normal.png differ
diff --git a/themes/serenity/titlebar/floating_focus_active.png b/themes/serenity/titlebar/floating_focus_active.png
new file mode 100644
index 0000000..82dcc7c
Binary files /dev/null and b/themes/serenity/titlebar/floating_focus_active.png differ
diff --git a/themes/serenity/titlebar/floating_focus_inactive.png b/themes/serenity/titlebar/floating_focus_inactive.png
new file mode 100644
index 0000000..c19ba80
Binary files /dev/null and b/themes/serenity/titlebar/floating_focus_inactive.png differ
diff --git a/themes/serenity/titlebar/floating_normal_active.png b/themes/serenity/titlebar/floating_normal_active.png
new file mode 100644
index 0000000..62342d1
Binary files /dev/null and b/themes/serenity/titlebar/floating_normal_active.png differ
diff --git a/themes/serenity/titlebar/floating_normal_inactive.png b/themes/serenity/titlebar/floating_normal_inactive.png
new file mode 100644
index 0000000..e2bbdfa
Binary files /dev/null and b/themes/serenity/titlebar/floating_normal_inactive.png differ
diff --git a/themes/serenity/titlebar/maximized_focus_active.png b/themes/serenity/titlebar/maximized_focus_active.png
new file mode 100644
index 0000000..728e508
Binary files /dev/null and b/themes/serenity/titlebar/maximized_focus_active.png differ
diff --git a/themes/serenity/titlebar/maximized_focus_inactive.png b/themes/serenity/titlebar/maximized_focus_inactive.png
new file mode 100644
index 0000000..b158e43
Binary files /dev/null and b/themes/serenity/titlebar/maximized_focus_inactive.png differ
diff --git a/themes/serenity/titlebar/maximized_normal_active.png b/themes/serenity/titlebar/maximized_normal_active.png
new file mode 100644
index 0000000..728e508
Binary files /dev/null and b/themes/serenity/titlebar/maximized_normal_active.png differ
diff --git a/themes/serenity/titlebar/maximized_normal_inactive.png b/themes/serenity/titlebar/maximized_normal_inactive.png
new file mode 100644
index 0000000..b158e43
Binary files /dev/null and b/themes/serenity/titlebar/maximized_normal_inactive.png differ
diff --git a/themes/serenity/titlebar/minimize_focus.png b/themes/serenity/titlebar/minimize_focus.png
new file mode 100644
index 0000000..5112464
Binary files /dev/null and b/themes/serenity/titlebar/minimize_focus.png differ
diff --git a/themes/serenity/titlebar/minimize_normal.png b/themes/serenity/titlebar/minimize_normal.png
new file mode 100644
index 0000000..5112464
Binary files /dev/null and b/themes/serenity/titlebar/minimize_normal.png differ
diff --git a/themes/serenity/titlebar/ontop_focus_active.png b/themes/serenity/titlebar/ontop_focus_active.png
new file mode 100644
index 0000000..312c00b
Binary files /dev/null and b/themes/serenity/titlebar/ontop_focus_active.png differ
diff --git a/themes/serenity/titlebar/ontop_focus_inactive.png b/themes/serenity/titlebar/ontop_focus_inactive.png
new file mode 100644
index 0000000..a48e1c5
Binary files /dev/null and b/themes/serenity/titlebar/ontop_focus_inactive.png differ
diff --git a/themes/serenity/titlebar/ontop_normal_active.png b/themes/serenity/titlebar/ontop_normal_active.png
new file mode 100644
index 0000000..117a203
Binary files /dev/null and b/themes/serenity/titlebar/ontop_normal_active.png differ
diff --git a/themes/serenity/titlebar/ontop_normal_inactive.png b/themes/serenity/titlebar/ontop_normal_inactive.png
new file mode 100644
index 0000000..d3a10c8
Binary files /dev/null and b/themes/serenity/titlebar/ontop_normal_inactive.png differ
diff --git a/themes/serenity/titlebar/sticky_focus_active.png b/themes/serenity/titlebar/sticky_focus_active.png
new file mode 100644
index 0000000..814499b
Binary files /dev/null and b/themes/serenity/titlebar/sticky_focus_active.png differ
diff --git a/themes/serenity/titlebar/sticky_focus_inactive.png b/themes/serenity/titlebar/sticky_focus_inactive.png
new file mode 100644
index 0000000..21b000d
Binary files /dev/null and b/themes/serenity/titlebar/sticky_focus_inactive.png differ
diff --git a/themes/serenity/titlebar/sticky_normal_active.png b/themes/serenity/titlebar/sticky_normal_active.png
new file mode 100644
index 0000000..bdb5595
Binary files /dev/null and b/themes/serenity/titlebar/sticky_normal_active.png differ
diff --git a/themes/serenity/titlebar/sticky_normal_inactive.png b/themes/serenity/titlebar/sticky_normal_inactive.png
new file mode 100644
index 0000000..a96b9b1
Binary files /dev/null and b/themes/serenity/titlebar/sticky_normal_inactive.png differ
diff --git a/themes/unity_mate/theme.lua b/themes/unity_mate/theme.lua
index 2e62355..bc3b12d 100644
--- a/themes/unity_mate/theme.lua
+++ b/themes/unity_mate/theme.lua
@@ -148,52 +148,52 @@ theme.systray_icon_spacing = 2
 
 -- Define the image to load
 
-theme.titlebar_ontop_button_normal_inactive = themes_path.."unity/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path.."unity/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."unity/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path.."unity/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_inactive = themes_path.."unity_mate/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."unity_mate/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."unity_mate/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."unity_mate/titlebar/ontop_focus_active.png"
 
-theme.titlebar_sticky_button_normal_inactive = themes_path.."unity/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path.."unity/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."unity/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path.."unity/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_inactive = themes_path.."unity_mate/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."unity_mate/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."unity_mate/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."unity_mate/titlebar/sticky_focus_active.png"
 
-theme.titlebar_floating_button_normal_inactive = themes_path.."unity/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path.."unity/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."unity/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path.."unity/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_inactive = themes_path.."unity_mate/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."unity_mate/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."unity_mate/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."unity_mate/titlebar/floating_focus_active.png"
 
 theme = theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal")
 theme = theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus")
 
-theme.titlebar_close_button_normal = themes_path.."unity/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path.."unity/titlebar/close_focus.png"
+theme.titlebar_close_button_normal = themes_path.."unity_mate/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."unity_mate/titlebar/close_focus.png"
 
-theme.titlebar_minimize_button_normal = themes_path.."unity/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path.."unity/titlebar/minimize_focus.png"
+theme.titlebar_minimize_button_normal = themes_path.."unity_mate/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."unity_mate/titlebar/minimize_focus.png"
 
-theme.titlebar_maximized_button_normal_inactive = themes_path.."unity/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path.."unity/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."unity/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path.."unity/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_inactive = themes_path.."unity_mate/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."unity_mate/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."unity_mate/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."unity_mate/titlebar/maximized_focus_active.png"
 
 -- You can use your own layout icons like this:
-theme.layout_fairh = themes_path.."unity/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."unity/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."unity/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."unity/layouts/magnifierw.png"
-theme.layout_max = themes_path.."unity/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."unity/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."unity/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."unity/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."unity/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."unity/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."unity/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."unity/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."unity/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."unity/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."unity/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."unity/layouts/cornersew.png"
+theme.layout_fairh = themes_path.."unity_mate/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."unity_mate/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."unity_mate/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."unity_mate/layouts/magnifierw.png"
+theme.layout_max = themes_path.."unity_mate/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."unity_mate/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."unity_mate/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."unity_mate/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."unity_mate/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."unity_mate/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."unity_mate/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."unity_mate/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."unity_mate/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."unity_mate/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."unity_mate/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."unity_mate/layouts/cornersew.png"
 
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(
@@ -219,35 +219,35 @@ local icons = {
     "battery-low-charging-symbolic"
 }
 for _,v in pairs(icons) do
-    theme[v] = themes_path.."unity/icons/"..v..".png"
-    theme[v:gsub("-charging","")] = themes_path.."unity/icons/"..v:gsub("-charging","")..".png"
+    theme[v] = themes_path.."unity_mate/icons/"..v..".png"
+    theme[v:gsub("-charging","")] = themes_path.."unity_mate/icons/"..v:gsub("-charging","")..".png"
 end
-theme["battery-full-charged-symbolic"] = themes_path.."unity/icons/battery-full-charged-symbolic.png"
-theme["battery-missing-symbolic"] = themes_path.."unity/icons/battery-missing-symbolic.png"
-theme["ac-adapter-symbolic"] = themes_path.."unity/icons/ac-adapter-symbolic.png"
-theme["backlight-symbolic"] = themes_path.."unity/icons/backlight-symbolic.png"
-theme["notifications-area-symbolic"] = themes_path.."unity/icons/notifications-area-symbolic.png"
+theme["battery-full-charged-symbolic"] = themes_path.."unity_mate/icons/battery-full-charged-symbolic.png"
+theme["battery-missing-symbolic"] = themes_path.."unity_mate/icons/battery-missing-symbolic.png"
+theme["ac-adapter-symbolic"] = themes_path.."unity_mate/icons/ac-adapter-symbolic.png"
+theme["backlight-symbolic"] = themes_path.."unity_mate/icons/backlight-symbolic.png"
+theme["notifications-area-symbolic"] = themes_path.."unity_mate/icons/notifications-area-symbolic.png"
 
-theme["mpc-previous-symbolic"] = themes_path.."unity/icons/mpc-previous-symbolic.png"
+theme["mpc-previous-symbolic"] = themes_path.."unity_mate/icons/mpc-previous-symbolic.png"
 
-theme["mpc-play-symbolic"] = themes_path.."unity/icons/mpc-play-symbolic.png"
-theme["mpc-pause-symbolic"] = themes_path.."unity/icons/mpc-pause-symbolic.png"
-theme["mpc-next-symbolic"] = themes_path.."unity/icons/mpc-next-symbolic.png"
+theme["mpc-play-symbolic"] = themes_path.."unity_mate/icons/mpc-play-symbolic.png"
+theme["mpc-pause-symbolic"] = themes_path.."unity_mate/icons/mpc-pause-symbolic.png"
+theme["mpc-next-symbolic"] = themes_path.."unity_mate/icons/mpc-next-symbolic.png"
 
-theme["action-poweroff-symbolic"] = themes_path.."unity/icons/action-poweroff-symbolic.png"
-theme["action-lock-screen-symbolic"] = themes_path.."unity/icons/action-lock-screen-symbolic.png"
-theme["action-suspend-symbolic"] = themes_path.."unity/icons/action-suspend-symbolic.png"
-theme["volume-high-symbolic"] = themes_path.."unity/icons/volume-high-symbolic.png"
-theme["volume-medium-symbolic"] = themes_path.."unity/icons/volume-medium-symbolic.png"
-theme["volume-low-symbolic"] = themes_path.."unity/icons/volume-low-symbolic.png"
-theme["volume-muted-symbolic"] = themes_path.."unity/icons/volume-muted-symbolic.png"
+theme["action-poweroff-symbolic"] = themes_path.."unity_mate/icons/action-poweroff-symbolic.png"
+theme["action-lock-screen-symbolic"] = themes_path.."unity_mate/icons/action-lock-screen-symbolic.png"
+theme["action-suspend-symbolic"] = themes_path.."unity_mate/icons/action-suspend-symbolic.png"
+theme["volume-high-symbolic"] = themes_path.."unity_mate/icons/volume-high-symbolic.png"
+theme["volume-medium-symbolic"] = themes_path.."unity_mate/icons/volume-medium-symbolic.png"
+theme["volume-low-symbolic"] = themes_path.."unity_mate/icons/volume-low-symbolic.png"
+theme["volume-muted-symbolic"] = themes_path.."unity_mate/icons/volume-muted-symbolic.png"
 
 
-theme.wallpaper = themes_path.."unity/background.png"
-theme.wallpapers_icon = themes_path.."unity/icons/wallpapers.png"
+theme.wallpaper = themes_path.."unity_mate/background.png"
+theme.wallpapers_icon = themes_path.."unity_mate/icons/wallpapers.png"
 -- Default icon for clients
 -- This one has to be baked as a surface to avoid memory leaks
-theme.icon_default = themes_path.."unity/icons/unknown-app.png"
+theme.icon_default = themes_path.."unity_mate/icons/unknown-app.png"
 
 for _,v in pairs({
     "battery-caution-symbolic",
diff --git a/widgets/base/popuptitle.lua b/widgets/base/popuptitle.lua
index 57723b0..2b16eaf 100644
--- a/widgets/base/popuptitle.lua
+++ b/widgets/base/popuptitle.lua
@@ -22,14 +22,14 @@ return function(args)
             title = args.title
         })))
     else
-        widget = wibox.widget({
-            t.container(t.article({
+        widget = wibox.widget(t.container({
+            t.article({
                 icon = root_path.."/themes/"..global.theme.."/"..args.icon,
                 title = args.title
-            })),
+            }),
             widget = wibox.container.rotate,
             direction = "east"
-        })
+        }))
     end
     return widget
 end
diff --git a/widgets/base/separator.lua b/widgets/base/separator.lua
new file mode 100644
index 0000000..9aaf145
--- /dev/null
+++ b/widgets/base/separator.lua
@@ -0,0 +1,21 @@
+--   This file is part of Reno desktop.
+--
+--  Reno desktop is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+--
+--  Reno desktop is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License along with Reno desktop. If not, see <https://www.gnu.org/licenses/>. 
+-- Base for widgets
+local awmtk2 = require("awmtk2")
+local wibox = require("wibox")
+
+return function(args)
+    local style = awmtk2.create_style("separator",awmtk2.default,args.style,args.vertical)
+    local templates = awmtk2.create_template_lib("separator",awmtk2.templates,args.templates)
+    local t = awmtk2.build_templates(templates,style,args.vertical)
+    local widget = wibox.widget(t.container(
+        (args.vertical and t.hseparator()) or
+        t.vseparator()
+    ))
+    return widget
+end
diff --git a/widgets/base/subpanel.lua b/widgets/base/subpanel.lua
index 2a42f01..ae671f4 100644
--- a/widgets/base/subpanel.lua
+++ b/widgets/base/subpanel.lua
@@ -8,9 +8,6 @@
 -- For those rare occasions when you want to group widgets in a panel
 local awmtk2 = require("awmtk2")
 local wibox = require("wibox")
-local gears = require("gears")
-local awful = require("awful")
-local beautiful = require("beautiful")
 
 return function(args)
     local style = awmtk2.create_style("subpanel",