diff --git a/_widgets/calendar-widget.md b/_widgets/calendar-widget.md
index c677ec7..8c939b8 100644
--- a/_widgets/calendar-widget.md
+++ b/_widgets/calendar-widget.md
@@ -3,29 +3,55 @@ layout: page
 ---
 # Calendar Widget
 
-Calendar widget for Awesome WM - slightly improved version of the `wibox.widget.calendar`. Also supports mouse scroll up/down in order ot switch month - scroll up - shows next month, scroll down - previous.
+Calendar widget for Awesome WM - slightly improved version of the `wibox.widget.calendar`.
 
-Top center placement:
+## Features
 
-![calendar_top](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/calendar_top.png)
+ - mouse support: scroll up - shows next month, scroll down - previous
+ - themes:
+  
+  nord (default):
 
-Top right placement:
+  ![nord_theme](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/nord.png)
 
-![calendar_top_right](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/calendar_top_right.png)
+  outrun:
 
-The placement is setup in theme.lua by `calendar_placement` variable, currently supported `top` (default), `top_right`, `bottom_right`. 
+  ![outrun_theme](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/outrun.png)
 
-# How to use
+ - setup widget placement
+  
+  top center - in case you clock is centered:
+
+   ![calendar_top](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/calendar_top.png)
+
+  top right - for default awesome config:
+
+  ![calendar_top_right](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/calendar_top_right.png)
+
+  bottom right - in case your wibar at the bottom:
+
+  ![calendar_bottom_right](../awesome-wm-widgets/assets/img/screenshots/calendar-widget/calendar_bottom_right.png)
+
+
+## How to use
 
 This widget needs an 'anchor' - another widget which triggers visibility of the calendar. Default `mytextclock` is the perfect candidate!
 
 ```lua
 local calendar_widget = require("awesome-wm-widgets.calendar-widget.calendar")
 -- ...
+-- {{{ Wibar
 -- Create a textclock widget
 mytextclock = wibox.widget.textclock()
-mytextclock:connect_signal("button::press",
+-- default
+cw = calendar_widget()
+-- or customized
+cw = calendar_widget({
+    theme = 'outrun',
+    placement = 'bottom_right'
+})
+mytextclock:connect_signal("button::press", 
     function(_, _, _, button)
-        if button == 1 then calendar_widget.toggle() end
+        if button == 1 then cw.toggle() end
     end)
-```
\ No newline at end of file
+```
diff --git a/assets/img/screenshots/audio-volume-muted-symbolic.png b/assets/img/screenshots/audio-volume-muted-symbolic.png
deleted file mode 100644
index b9dffd6..0000000
Binary files a/assets/img/screenshots/audio-volume-muted-symbolic.png and /dev/null differ
diff --git a/assets/img/screenshots/audio-volume-muted-symbolic.svg b/assets/img/screenshots/audio-volume-muted-symbolic.svg
deleted file mode 100644
index e577d05..0000000
--- a/assets/img/screenshots/audio-volume-muted-symbolic.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   viewBox="0 0 16 16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="audio-volume-muted-symbolic.svg">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1215"
-     inkscape:window-height="776"
-     id="namedview28"
-     showgrid="true"
-     inkscape:zoom="38.125"
-     inkscape:cx="3.4229508"
-     inkscape:cy="7.947541"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4158" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <path
-     d="M 6,2 2,6 2,10 6,14 6,9 7,8 6,7 Z"
-     id="path18"
-     inkscape:connector-curvature="0"
-     style="fill:#bebebe"
-     sodipodi:nodetypes="cccccccc" />
-  <path
-     d="M 1.300003,5 C 0.216589,5 0,6.163269 0,7.4 L 0,8.6 C 0,9.836747 0.24312,11 1.300003,11 L 3,11 3,5 Z"
-     id="path20"
-     inkscape:connector-curvature="0"
-     style="fill:#bebebe"
-     sodipodi:nodetypes="ssssccs" />
-  <path
-     style="opacity:0.3;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 13.140638,1 11.726417,2.413582 C 12.808349,3.4955144 13.990412,5.4467621 14,8 c 0,2.551493 -1.192916,4.505751 -2.273583,5.586418 L 13.140638,15 C 14.595711,13.544927 16.019176,11 16,8 16.035061,5 14.595117,2.4544787 13.140638,1 Z"
-     id="path4508"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="opacity:0.3;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 11,3.1156678 9.5897193,4.5261118 C 10.372347,5.3087395 11,6.5690611 11,8 11,9.4309388 10.372767,10.690952 9.5897193,11.474 L 11,12.884 C 12.275645,11.608355 13,9.854095 13,8 13,6.1543677 12.273068,4.3887355 11,3.1156678 Z"
-     id="path4529"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="opacity:0.3;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 8.629,5 7.2094668,6.4096296 C 8,7.05621 8,7.805653 8,8 8,8.1932576 7.982199,8.9408674 7.209,9.59 L 8.6289063,11 C 9.8466375,9.952694 10,8.5984701 10,8 10,7.400497 9.854476,6.062891 8.629,5 Z"
-     id="path4569"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccscccc" />
-</svg>
diff --git a/assets/img/screenshots/audio-volume-muted-symbolic_red.png b/assets/img/screenshots/audio-volume-muted-symbolic_red.png
deleted file mode 100644
index f47807d..0000000
Binary files a/assets/img/screenshots/audio-volume-muted-symbolic_red.png and /dev/null differ
diff --git a/assets/img/screenshots/audio-volume-muted-symbolic_red.svg b/assets/img/screenshots/audio-volume-muted-symbolic_red.svg
deleted file mode 100644
index d42c2ba..0000000
--- a/assets/img/screenshots/audio-volume-muted-symbolic_red.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   viewBox="0 0 16 16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="audio-volume-muted-symbolic.svg">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1215"
-     inkscape:window-height="776"
-     id="namedview28"
-     showgrid="true"
-     inkscape:zoom="38.125"
-     inkscape:cx="3.4229508"
-     inkscape:cy="7.947541"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4158" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4" />
-  <path
-     d="M 6,2 2,6 2,10 6,14 6,9 7,8 6,7 Z"
-     id="path18"
-     inkscape:connector-curvature="0"
-     style="fill:#ed4737"
-     sodipodi:nodetypes="cccccccc" />
-  <path
-     d="M 1.300003,5 C 0.216589,5 0,6.163269 0,7.4 L 0,8.6 C 0,9.836747 0.24312,11 1.300003,11 L 3,11 3,5 Z"
-     id="path20"
-     inkscape:connector-curvature="0"
-     style="fill:#ed4737"
-     sodipodi:nodetypes="ssssccs" />
-  <path
-     style="opacity:0.3;fill:#ed4737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 13.140638,1 11.726417,2.413582 C 12.808349,3.4955144 13.990412,5.4467621 14,8 c 0,2.551493 -1.192916,4.505751 -2.273583,5.586418 L 13.140638,15 C 14.595711,13.544927 16.019176,11 16,8 16.035061,5 14.595117,2.4544787 13.140638,1 Z"
-     id="path4508"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="opacity:0.3;fill:#ed4737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 11,3.1156678 9.5897193,4.5261118 C 10.372347,5.3087395 11,6.5690611 11,8 11,9.4309388 10.372767,10.690952 9.5897193,11.474 L 11,12.884 C 12.275645,11.608355 13,9.854095 13,8 13,6.1543677 12.273068,4.3887355 11,3.1156678 Z"
-     id="path4529"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="opacity:0.3;fill:#ed4737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 8.629,5 7.2094668,6.4096296 C 8,7.05621 8,7.805653 8,8 8,8.1932576 7.982199,8.9408674 7.209,9.59 L 8.6289063,11 C 9.8466375,9.952694 10,8.5984701 10,8 10,7.400497 9.854476,6.062891 8.629,5 Z"
-     id="path4569"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccscccc" />
-</svg>
diff --git a/assets/img/screenshots/awesome-taglist-1.png b/assets/img/screenshots/awesome-taglist-1.png
deleted file mode 100644
index 3626485..0000000
Binary files a/assets/img/screenshots/awesome-taglist-1.png and /dev/null differ
diff --git a/assets/img/screenshots/awesome-taglist-2.png b/assets/img/screenshots/awesome-taglist-2.png
deleted file mode 100644
index 9539cf5..0000000
Binary files a/assets/img/screenshots/awesome-taglist-2.png and /dev/null differ
diff --git a/assets/img/screenshots/battery-wid-1.png b/assets/img/screenshots/battery-wid-1.png
deleted file mode 100644
index 00e1618..0000000
Binary files a/assets/img/screenshots/battery-wid-1.png and /dev/null differ
diff --git a/assets/img/screenshots/battery-wid-2.png b/assets/img/screenshots/battery-wid-2.png
deleted file mode 100644
index ae20af2..0000000
Binary files a/assets/img/screenshots/battery-wid-2.png and /dev/null differ
diff --git a/assets/img/screenshots/battery-wid-22.png b/assets/img/screenshots/battery-wid-22.png
deleted file mode 100644
index 38761f7..0000000
Binary files a/assets/img/screenshots/battery-wid-22.png and /dev/null differ
diff --git a/assets/img/screenshots/battery-wid-3.png b/assets/img/screenshots/battery-wid-3.png
deleted file mode 100644
index 352b496..0000000
Binary files a/assets/img/screenshots/battery-wid-3.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-10_c.png b/assets/img/screenshots/batteryarc-10_c.png
deleted file mode 100644
index 3faf753..0000000
Binary files a/assets/img/screenshots/batteryarc-10_c.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-10_d.png b/assets/img/screenshots/batteryarc-10_d.png
deleted file mode 100644
index c9aa8d3..0000000
Binary files a/assets/img/screenshots/batteryarc-10_d.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-20_c.png b/assets/img/screenshots/batteryarc-20_c.png
deleted file mode 100644
index f0a191d..0000000
Binary files a/assets/img/screenshots/batteryarc-20_c.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-20_d.png b/assets/img/screenshots/batteryarc-20_d.png
deleted file mode 100644
index 15fabed..0000000
Binary files a/assets/img/screenshots/batteryarc-20_d.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-80_c.png b/assets/img/screenshots/batteryarc-80_c.png
deleted file mode 100644
index e6dae75..0000000
Binary files a/assets/img/screenshots/batteryarc-80_c.png and /dev/null differ
diff --git a/assets/img/screenshots/batteryarc-80_d.png b/assets/img/screenshots/batteryarc-80_d.png
deleted file mode 100644
index 220c8e3..0000000
Binary files a/assets/img/screenshots/batteryarc-80_d.png and /dev/null differ
diff --git a/assets/img/screenshots/brightness-wid-1.png b/assets/img/screenshots/brightness-wid-1.png
deleted file mode 100644
index f9200eb..0000000
Binary files a/assets/img/screenshots/brightness-wid-1.png and /dev/null differ
diff --git a/assets/img/screenshots/calendar-widget/calendar_bottom_right.png b/assets/img/screenshots/calendar-widget/calendar_bottom_right.png
new file mode 100644
index 0000000..2bc2e82
Binary files /dev/null and b/assets/img/screenshots/calendar-widget/calendar_bottom_right.png differ
diff --git a/assets/img/screenshots/calendar-widget/nord.png b/assets/img/screenshots/calendar-widget/nord.png
new file mode 100644
index 0000000..94f9f7e
Binary files /dev/null and b/assets/img/screenshots/calendar-widget/nord.png differ
diff --git a/assets/img/screenshots/calendar-widget/outrun.png b/assets/img/screenshots/calendar-widget/outrun.png
new file mode 100644
index 0000000..d59c123
Binary files /dev/null and b/assets/img/screenshots/calendar-widget/outrun.png differ
diff --git a/assets/img/screenshots/cpu-widget.gif b/assets/img/screenshots/cpu-widget.gif
deleted file mode 100644
index ac7542d..0000000
Binary files a/assets/img/screenshots/cpu-widget.gif and /dev/null differ
diff --git a/assets/img/screenshots/email-widget-1.png b/assets/img/screenshots/email-widget-1.png
deleted file mode 100644
index 5290ea8..0000000
Binary files a/assets/img/screenshots/email-widget-1.png and /dev/null differ
diff --git a/assets/img/screenshots/email-widget-2.png b/assets/img/screenshots/email-widget-2.png
deleted file mode 100644
index 0a0fd3a..0000000
Binary files a/assets/img/screenshots/email-widget-2.png and /dev/null differ
diff --git a/assets/img/screenshots/ram-widget.gif b/assets/img/screenshots/ram-widget.gif
deleted file mode 100644
index 736f894..0000000
Binary files a/assets/img/screenshots/ram-widget.gif and /dev/null differ
diff --git a/assets/img/screenshots/spotify-shell.gif b/assets/img/screenshots/spotify-shell.gif
deleted file mode 100644
index 6696b3a..0000000
Binary files a/assets/img/screenshots/spotify-shell.gif and /dev/null differ
diff --git a/assets/img/screenshots/spotify-widget.png b/assets/img/screenshots/spotify-widget.png
deleted file mode 100644
index 296c2f6..0000000
Binary files a/assets/img/screenshots/spotify-widget.png and /dev/null differ
diff --git a/assets/img/screenshots/systray.png b/assets/img/screenshots/systray.png
deleted file mode 100644
index 9456f0c..0000000
Binary files a/assets/img/screenshots/systray.png and /dev/null differ
diff --git a/assets/img/screenshots/translate-shell.gif b/assets/img/screenshots/translate-shell.gif
deleted file mode 100644
index 3645d47..0000000
Binary files a/assets/img/screenshots/translate-shell.gif and /dev/null differ
diff --git a/assets/img/screenshots/volume-widget.png b/assets/img/screenshots/volume-widget.png
deleted file mode 100644
index 6f09cce..0000000
Binary files a/assets/img/screenshots/volume-widget.png and /dev/null differ
diff --git a/assets/img/screenshots/volumearc-widget.gif b/assets/img/screenshots/volumearc-widget.gif
deleted file mode 100644
index 61fa486..0000000
Binary files a/assets/img/screenshots/volumearc-widget.gif and /dev/null differ
diff --git a/assets/img/screenshots/volumebar-widget.gif b/assets/img/screenshots/volumebar-widget.gif
deleted file mode 100644
index 16653c8..0000000
Binary files a/assets/img/screenshots/volumebar-widget.gif and /dev/null differ
diff --git a/assets/img/screenshots/weather-widget.png b/assets/img/screenshots/weather-widget.png
deleted file mode 100644
index 177b350..0000000
Binary files a/assets/img/screenshots/weather-widget.png and /dev/null differ
diff --git a/update_from_master.sh b/update_from_master.sh
old mode 100644
new mode 100755