diff --git a/README.md b/README.md
index 798e5260c..03302542b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Premium and Open Source dashboard template with responsive and high-quality UI.
 
 <strong><a href="https://preview-dev.tabler.io">View Demo</a> | <a href="https://github.com/tabler/tabler-react">View React Version</a> | <a href="https://github.com/tabler/tabler/archive/master.zip">Download ZIP</a> | <a href="https://goo.gl/zJP2dT">Join us on Slack</a></strong>
 
-![Tabler preview](https://tabler.github.io/img/dashboard-preview.png)
+![Tabler preview](https://raw.githubusercontent.com/tabler/tabler/dev/static/img/tabler-preview.png)
 
 ## Status
 
diff --git a/js/tabler-charts.js b/js/tabler-charts.js
index e09c743b7..1cada1a26 100644
--- a/js/tabler-charts.js
+++ b/js/tabler-charts.js
@@ -94,7 +94,6 @@ if (window.Apex) {
       width: 2,
       curve: 'smooth',
       lineCap: "round",
-      colors: ["transparent"]
     },
 
     fill: {
diff --git a/package.json b/package.json
index 51b4fb91a..a20f7af26 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,10 @@
   "bugs": {
     "url": "https://github.com/tabler/tabler/issues"
   },
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/codecalm"
+  },
   "engines": {
     "node": ">=10"
   },
@@ -69,19 +73,19 @@
     "bundlesize": "0.18.0",
     "clean-css-cli": "4.3.0",
     "cross-env": "6.0.3",
-    "eslint": "6.7.1",
+    "eslint": "6.7.2",
     "eslint-config-xo": "0.27.2",
     "eslint-plugin-import": "2.18.2",
-    "eslint-plugin-unicorn": "13.0.0",
+    "eslint-plugin-unicorn": "14.0.1",
     "glob": "^7.1.6",
-    "http-server": "0.11.1",
+    "http-server": "0.12.0",
     "icon-font-generator": "2.1.10",
     "node-sass": "4.13.0",
     "node-sass-package-importer": "5.3.2",
     "nodemon": "^2.0.1",
     "npm-run-all": "4.1.5",
     "postcss-cli": "6.1.3",
-    "rollup": "1.27.5",
+    "rollup": "1.27.7",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-babel-minify": "9.1.1",
     "rollup-plugin-commonjs": "10.1.0",
@@ -91,7 +95,7 @@
     "stylelint": "12.0.0",
     "stylelint-config-twbs-bootstrap": "1.0.0",
     "svgo": "1.3.2",
-    "terser": "4.4.0",
+    "terser": "4.4.1",
     "yaml": "1.7.2"
   },
   "dependencies": {
diff --git a/pages/_docs/avatars.md b/pages/_docs/avatars.md
index d974fd63c..966329320 100644
--- a/pages/_docs/avatars.md
+++ b/pages/_docs/avatars.md
@@ -14,6 +14,50 @@ Create and group avatars of various shapes and sizes with one component.
 {% include ui/avatar.html person-id=3 %}
 {% endexample %}
 
+### Avatar image
+
+Set an image as the background.
+
+{% example html wrapper=avatar-list %}
+{% include ui/avatar.html person-id=1 %}
+{% include ui/avatar.html person-id=3 %}
+{% include ui/avatar.html person-id=4 %}
+{% endexample %}
+
+### Initials
+
+You can easily use initials instead of images.
+
+{% example html wrapper=avatar-list %}
+{% include ui/avatar.html placeholder="AB" %}
+{% include ui/avatar.html placeholder="CD" %}
+{% include ui/avatar.html placeholder="EF" %}
+{% include ui/avatar.html placeholder="GH" %}
+{% include ui/avatar.html placeholder="IJ" %}
+{% endexample %}
+
+### Avatar icons
+
+You can also use icons in avatars.
+
+{% example html wrapper=avatar-list %}
+{% include ui/avatar.html icon="user" %}
+{% include ui/avatar.html icon="plus" %}
+{% include ui/avatar.html icon="user-plus" %}
+{% endexample %}
+
+### Avatar initials color
+
+Customize the color of the avatars' background. You can click [here]({% docs_url colors %}) to see the list of available colors.
+
+{% example html wrapper=avatar-list %}
+{% include ui/avatar.html placeholder="AB" color="green" %}
+{% include ui/avatar.html placeholder="CD" color="red" %}
+{% include ui/avatar.html placeholder="EF" color="yellow" %}
+{% include ui/avatar.html placeholder="GH" color="blue" %}
+{% include ui/avatar.html placeholder="IJ" color="purple" %}
+{% endexample %}
+
 ### Avatar size
 
 Using Bootstrap’s typical naming structure, you can create a standard avatar, or scale it up to different sizes based on what’s needed.
@@ -51,43 +95,18 @@ Change the shape of an avatar with the default Bootstrap image classes.
 {% include ui/avatar.html person-id=21 shape="rounded-lg" %}
 {% endexample %}
 
-### Initials
-
-{% example html wrapper=avatar-list %}
-{% include ui/avatar.html placeholder="AB" size="xl" %}
-{% include ui/avatar.html placeholder="CD" size="lg" %}
-{% include ui/avatar.html placeholder="EF" size="md" %}
-{% include ui/avatar.html placeholder="GH" %}
-{% include ui/avatar.html placeholder="IJ" size="sm" %}
-{% endexample %}
-
-
-### Avatar initials color
-
-[See more]({% docs_url colors %})
-
-{% example html wrapper=avatar-list %}
-{% include ui/avatar.html placeholder="AB" color="green" %}
-{% include ui/avatar.html placeholder="CD" color="red" %}
-{% include ui/avatar.html placeholder="EF" color="yellow" %}
-{% include ui/avatar.html placeholder="GH" color="blue" %}
-{% include ui/avatar.html placeholder="IJ" color="purple" %}
-{% endexample %}
-
-### Avatar initials icons
-
-{% example html wrapper=avatar-list %}
-{% include ui/avatar.html icon="user" %}
-{% include ui/avatar.html icon="plus" %}
-{% include ui/avatar.html icon="user-plus" %}
-{% endexample %}
-
 ### Avatars list
 
+You can easily create a list of avatars.
+
 {% example %}
 {% include ui/avatar-list.html %}
 {% endexample %}
 
+### Stacked list
+
+Make the list stack when it reaches a certain length.
+
 {% example %}
 <div class="avatar-list avatar-list-stacked">
   {% for person in site.data.people limit: 5 offset: 30 %}
@@ -95,4 +114,4 @@ Change the shape of an avatar with the default Bootstrap image classes.
   {% endfor %}
   <span class="avatar" element="a">+8</span>
 </div>
-{% endexample %}
+{% endexample %}
\ No newline at end of file
diff --git a/pages/_docs/charts.md b/pages/_docs/charts.md
index dc254571f..31a879a6e 100644
--- a/pages/_docs/charts.md
+++ b/pages/_docs/charts.md
@@ -18,7 +18,7 @@ menu: docs.charts
 			<div id="{{ key }}" style="height: 16rem"></div>
 		</div>
 	</div>
-	{% include ui/chart.html id=key chart-id=data %}
+	{% include ui/chart.html id=key chart-id=data show-scripts=true %}
 {% endexample %}
 {% endif %}
 {% endfor %}
diff --git a/pages/_docs/flags.md b/pages/_docs/flags.md
index 09e4fbd79..43394535c 100644
--- a/pages/_docs/flags.md
+++ b/pages/_docs/flags.md
@@ -15,6 +15,8 @@ done: true
 
 ### Flag sizes
 
+Using Bootstrap’s typical naming structure, you can create a standard flag, or scale it up to different sizes based on what’s needed.
+
 {% example html %}
 {% include ui/flag.html flag="pl" class="flag-size-xl mr-1" %}
 {% include ui/flag.html flag="pl" class="flag-size-lg mr-1" %}
@@ -24,6 +26,8 @@ done: true
 
 ### Types
 
+To set the flag of the country you want add a class `flag-(country name)`. For example to create a flag of Andorra your class should look like this: `.flag-ad`.
+
 <table>
 {% for flag in site.data.flags %}
 <tr>
diff --git a/pages/_docs/ribbons.md b/pages/_docs/ribbons.md
index 5fe18237a..5067c3ae5 100644
--- a/pages/_docs/ribbons.md
+++ b/pages/_docs/ribbons.md
@@ -12,24 +12,39 @@ new: true
 
 ### Ribbon position
 
+You can easily change the position of a ribbon by adding a class to the element.
+
+    `ribbon-top` - moves it to the top
+    `ribbon-right` - moves it to the right
+    `ribbon-bottom` - moves it to the bottom
+    `ribbon-left` - moves it to the lefg
+
+You can also use multiple classes at once for example: `.ribbon.ribbon-top.ribbon-left` moves the ribbon to the top left corner.
+
 {% example html columns=1 %}
 {% include cards/ribbon.html top=true left=true %}
 {% endexample %}
 
 ### Ribbon color
 
+Customize the ribbon's background color. You can click [here]({% docs_url colors %}) to see the list of available colors.
+
 {% example html columns=1 %}
 {% include cards/ribbon.html color="red" %}
 {% endexample %}
 
 ### Ribbon text
 
+Set your own text in a ribbon.
+
 {% example html columns=1 %}
 {% include cards/ribbon.html color="green" text="-50%" %}
 {% endexample %}
 
 ### Ribbon style
 
+Change the style of a ribbon. 
+
 {% example html columns=1 %}
 {% include cards/ribbon.html bookmark=true color="orange" text="-50%" %}
 {% endexample %}
diff --git a/pages/_includes/cards/charts/active-users.html b/pages/_includes/cards/charts/active-users.html
index 8588f0427..41b987ed1 100644
--- a/pages/_includes/cards/charts/active-users.html
+++ b/pages/_includes/cards/charts/active-users.html
@@ -13,6 +13,6 @@
          </div>
       </div>
 
-      {% include ui/chart.html chart-id="active-users" class="chart-sm" %}
+      {% include ui/chart.html chart-id="active-users" size="sm" %}
    </div>
 </div>
diff --git a/pages/_includes/cards/charts/new-clients.html b/pages/_includes/cards/charts/new-clients.html
index 444267b23..8bee88329 100644
--- a/pages/_includes/cards/charts/new-clients.html
+++ b/pages/_includes/cards/charts/new-clients.html
@@ -13,6 +13,6 @@
          </div>
       </div>
 
-      {% include ui/chart.html chart-id="new-clients" class="chart-sm" %}
+      {% include ui/chart.html chart-id="new-clients" size="sm" %}
    </div>
 </div>
diff --git a/pages/_includes/cards/charts/revenue.html b/pages/_includes/cards/charts/revenue.html
index 00f2f8a1b..fa41c8b22 100644
--- a/pages/_includes/cards/charts/revenue.html
+++ b/pages/_includes/cards/charts/revenue.html
@@ -13,5 +13,5 @@
          </div>
       </div>
    </div>
-   {% include ui/chart.html chart-id="revenue-bg" class="card-chart" %}
+   {% include ui/chart.html chart-id="revenue-bg" size="sm" %}
 </div>
diff --git a/pages/_includes/ui/chart.html b/pages/_includes/ui/chart.html
index 201618a86..4f6f2c760 100644
--- a/pages/_includes/ui/chart.html
+++ b/pages/_includes/ui/chart.html
@@ -1,136 +1,151 @@
 {% assign data = site.data.charts[include.chart-id] %}
 {% assign id = include.id | default: include.chart-id %}
 {% assign height = include.height | default: 10 %}
+{% assign class = include.class | default: '' %}
+
+{% if include['size'] == 'sm' %}
+   {% assign class = class | append: ' chart-sm' | strip %}
+   {% assign height = 2.5 %}
+{% endif %}
 
 {% if data %}
-<div id="chart-{{ id }}"{% if include.class %} class="{{ include.class }}"{% endif %}></div>
-{% capture_global scripts %}
+<div id="chart-{{ id }}"{% if class %} class="{{ class }}"{% endif %}></div>
+
+{% capture script %}
 <script>
-document.addEventListener("DOMContentLoaded", function(event) {
-   {% if jekyll.environment == 'development' %}window.tabler_chart = window.tabler_chart || {};{% endif %}
-   
-   var chartEl = document.getElementById('chart-{{ id }}');
-   window.ApexCharts && chartEl && ({% if jekyll.environment == 'development' %}window.tabler_chart["chart-{{ include.chart-id }}"] = {% endif %}new ApexCharts(chartEl, {
-      chart: {
-         type: '{{ data.type }}',
-         height: {{ height | times: 16 }},
-         {% if data.sparkline %}
-         sparkline: {
-            enabled: true
-         },
-         {% endif %}
-         {% if data.stacked %}
-         stacked: true,
-         {% endif %}
-      },
+	document.addEventListener("DOMContentLoaded", function(event) {
+		{% if jekyll.environment == 'development' %}window.tabler_chart = window.tabler_chart || {};{% endif %}
 
-      {% if data.type == 'area' %}
-      fill: {
-        opacity: .16
-      },
-      {% endif %}
+		window.ApexCharts && ({% if jekyll.environment == 'development' %}window.tabler_chart["chart-{{ include.chart-id }}"] = {% endif %}new ApexCharts(document.getElementById('chart-{{ id }}'), {
+			chart: {
+				type: '{{ data.type }}',
+				height: {{ height | times: 16 }},
+		{% if data.sparkline %}
+		sparkline: {
+			enabled: true
+		},
+		{% endif %}
+		{% if data.stacked %}
+		stacked: true,
+		{% endif %}
+	},
 
-      {% if data.title %}
-      title: {
-         text: '{{ data.title | escape }}'
-      },
-      {% endif %}
+		{% if data.type == 'area' %}
+		fill: {
+			opacity: .16
+		},
+		{% endif %}
 
-      {% if data.dashed-history or data.stroke-curve %}
-      stroke: {
-         {% if data.dashed-history %}
-         width: [2, 1],
-            dashArray: [0, 3],
-         {% endif %}
-         {% if data.stroke-curve %}
-         curve: '{{ data.stroke-curve }}',
-         {% endif %}
-      },
-      {% endif %}
+		{% if data.title %}
+		title: {
+			text: '{{ data.title | escape }}'
+		},
+		{% endif %}
 
-      {% if data.series %}
-      {% if data.type == 'pie' or data.type == 'donut' %}
-      series: [{% for serie in data.series %}{{ serie.data }}{% unless forloop.last %}, {% endunless %}{% endfor %}],
+		{% if data.dashed-history or data.stroke-curve %}
+		stroke: {
+			{% if data.dashed-history %}
+			width: [2, 1],
+				dashArray: [0, 3],
+			{% endif %}
+			{% if data.stroke-curve %}
+			curve: '{{ data.stroke-curve }}',
+			{% endif %}
+		},
+		{% endif %}
 
-      labels: [{% for serie in data.series %}"{{ serie.name }}"{% unless forloop.last %},{% endunless %}{% endfor %}],
+		{% if data.series %}
+		{% if data.type == 'pie' or data.type == 'donut' %}
+		series: [{% for serie in data.series %}{{ serie.data }}{% unless forloop.last %}, {% endunless %}{% endfor %}],
 
-      {% else %}
-      series: [{% for serie in data.series %}{
-         name: '{{ serie.name }}',
-         data: [{{ serie.data | join: ', '}}]
-      }{% unless forloop.last %},{% endunless %}{% endfor %}],
-      {% endif %}
-      {% endif %}
+		labels: [{% for serie in data.series %}"{{ serie.name }}"{% unless forloop.last %},{% endunless %}{% endfor %}],
 
-      {% if data.show-grid %}
-      grid: {
-         show: true,
-      },
-      {% endif %}
+		{% else %}
+		series: [{% for serie in data.series %}{
+			name: '{{ serie.name }}',
+				data: [{{ serie.data | join: ', '}}]
+		}{% unless forloop.last %},{% endunless %}{% endfor %}],
+		{% endif %}
+		{% endif %}
 
-      {% if data.show-data-labels %}
-      dataLabels: {
-         enabled: true,
-      },
-      {% endif %}
+		{% if data.show-grid %}
+		grid: {
+			show: true,
+		},
+		{% endif %}
 
-      {% if data.categories or data.days-labels-count %}
-      xaxis: {
-         {% if data.categories %}categories: [{% for category in data.categories %}'{{ category }}'{% unless forloop.last %}, {% endunless %}{% endfor %}],{% endif %}
-         {% if data.days-labels-count %}type: 'datetime',{% endif %}
-      },
-      {% endif %}
+		{% if data.show-data-labels %}
+		dataLabels: {
+			enabled: true,
+		},
+		{% endif %}
 
-      {% if data.auto-min %}
-      yaxis: {
-         min: function(min) { return min },
-      },
-      {% endif %}
+		{% if data.categories or data.days-labels-count %}
+		xaxis: {
+			{% if data.categories %}categories: [{% for category in data.categories %}'{{ category }}'{% unless forloop.last %}, {% endunless %}{% endfor %}],{% endif %}
+			{% if data.days-labels-count %}type: 'datetime',{% endif %}
+		},
+		{% endif %}
 
-      {% if data.days-labels-count %}
-      labels: [...Array({{ data.days-labels-count }}).keys()].map(n => `2019-09-${n+1}`),
-      {% endif %}
+		{% if data.auto-min %}
+		yaxis: {
+			min: function(min) { return min },
+		},
+		{% endif %}
 
-      {% if data.rotated %}
-      plotOptions: {
-         bar: {
-            horizontal: true,
-         }
-      },
-      {% endif %}
+		{% if data.days-labels-count %}
+		labels: [...Array({{ data.days-labels-count }}).keys()].map(n => `2019-09-${n+1}`),
+		{% endif %}
 
-      {% if data.series %}
-      colors: [ //chart colors
-         {% for serie in data.series %}
-         {{ serie.color | default: 'blue' | tabler_js_color }}{% unless forloop.last %},{% endunless %}{% endfor %}
-      ],
-      {% endif %}
+		{% if data.rotated %}
+		plotOptions: {
+			bar: {
+				horizontal: true,
+			}
+		},
+		{% endif %}
 
-      {% if data.hide-legend %}
-      legend: {
-         show: false, //hide legend
-      },
-      {% endif %}
+		{% if data.series %}
+		colors: [ //chart colors
+			{% for serie in data.series %}
+		{{ serie.color | default: 'blue' | tabler_js_color }}{% unless forloop.last %},{% endunless %}{% endfor %}
+	],
+		{% endif %}
 
-      {% if data.hide-tooltip %}
-      tooltip: {
-         enabled: false
-      },
-      {% endif %}
+		{% if data.hide-legend %}
+		legend: {
+			show: false, //hide legend
+		},
+		{% endif %}
 
-      {% if data.hide-points %}
-      point: {
-         show: false
-      },
-      {% endif %}
+		{% if data.hide-tooltip %}
+		tooltip: {
+			enabled: false
+		},
+		{% endif %}
 
-      {% if data.show-markers %}
-      markers: {
-         size: 2
-      },
-      {% endif %}
-   })).render();
-});
+		{% if data.hide-points %}
+		point: {
+			show: false
+		},
+		{% endif %}
+
+		{% if data.show-markers %}
+		markers: {
+			size: 2
+		},
+		{% endif %}
+	})).render();
+	});
 </script>
-{% endcapture_global %}
+{% endcapture %}
+
+{% if include.show-scripts %}
+   {{ script }}
+{% else %}
+   {% capture_global scripts %}
+      {{ script }}
+   {% endcapture_global %}
+{% endif %}
+
 {% endif %}
diff --git a/pages/_includes/ui/map.html b/pages/_includes/ui/map.html
index cf82165a1..4702b4db8 100644
--- a/pages/_includes/ui/map.html
+++ b/pages/_includes/ui/map.html
@@ -5,7 +5,7 @@
 
 {% if data %}
 <div id="map-{{ id }}" style="height: {{ height }}rem"></div>
-{% capture_global scripts %}
+{% capture script %}
 <script>
 	{% if jekyll.environment == 'development' %}window.tabler_map = window.tabler_map || {};{% endif %}
 
@@ -29,5 +29,13 @@
 		});
 	});
 </script>
-{% endcapture_global %}
+{% endcapture %}
+
+{% if include.show-scripts %}
+   {{ script }}
+{% else %}
+   {% capture_global scripts %}
+      {{ script }}
+   {% endcapture_global %}
+{% endif %}
 {% endif %}
diff --git a/static/img/sample.jpg b/static/img/sample.jpg
deleted file mode 100644
index 2a5ce3792..000000000
Binary files a/static/img/sample.jpg and /dev/null differ
diff --git a/static/img/tabler-preview.png b/static/img/tabler-preview.png
new file mode 100644
index 000000000..daa76f81b
Binary files /dev/null and b/static/img/tabler-preview.png differ