diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml
index 0034686..4a61993 100644
--- a/sources/awesome-widget/package/contents/ui/widget.qml
+++ b/sources/awesome-widget/package/contents/ui/widget.qml
@@ -262,8 +262,8 @@ Item {
                     if (debug) console.debug()
                     if (model[currentIndex]["regexp"] == "functions")
                         tags.model = ["{{\n\n}}", "template{{\n\n}}",
-                            "aw_all<>()", "aw_count<>()", "aw_keys<>()",
-                            "aw_names<>()"]
+                            "aw_all<>{{}}", "aw_count<>{{}}", "aw_keys<>{{}}",
+                            "aw_names<>{{}}"]
                     else
                         tags.model = awKeys.dictKeys(true, model[currentIndex]["regexp"])
                     if (debug) console.info("Init model", tags.model, "for", model[currentIndex]["label"])
diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
index 4b75e7f..a8b7d96 100644
--- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp
+++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
@@ -86,6 +86,7 @@ void AWDataEngineAggregator::dropSource(const QString source)
     // connected we will try to disconnect it from systemmonitor and extsysmon
     m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent());
     m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent());
+    m_dataEngines[QString("time")]->disconnectSource(source, parent());
 }
 
 
diff --git a/sources/awesomewidgets/desktops/aw-bat-bar.desktop b/sources/awesomewidgets/desktops/aw-bat-bar.desktop
index 9aa9df0..5dac5d4 100644
--- a/sources/awesomewidgets/desktops/aw-bat-bar.desktop
+++ b/sources/awesomewidgets/desktops/aw-bat-bar.desktop
@@ -3,11 +3,14 @@ Encoding=UTF-8
 Name=bar3
 Comment=Simple bat bar
 X-AW-Value=bat
+X-AW-Custom=false
+X-AW-Max=100.0
+X-AW-Min=0.0
 X-AW-ActiveColor="0,0,0,255"
 X-AW-InactiveColor="255,255,255,255"
 X-AW-Type=Horizontal
 X-AW-Direction=LeftToRight
 X-AW-Height=25
 X-AW-Width=100
-X-AW-ApiVersion=3
+X-AW-ApiVersion=4
 X-AW-Number=3
diff --git a/sources/awesomewidgets/desktops/aw-cpu-bar.desktop b/sources/awesomewidgets/desktops/aw-cpu-bar.desktop
index 0c328a8..224f58b 100644
--- a/sources/awesomewidgets/desktops/aw-cpu-bar.desktop
+++ b/sources/awesomewidgets/desktops/aw-cpu-bar.desktop
@@ -3,11 +3,14 @@ Encoding=UTF-8
 Name=bar0
 Comment=Simple cpu bar
 X-AW-Value=cpu
+X-AW-Custom=false
+X-AW-Max=100.0
+X-AW-Min=0.0
 X-AW-ActiveColor="0,0,0,255"
 X-AW-InactiveColor="255,255,255,255"
 X-AW-Type=Horizontal
 X-AW-Direction=LeftToRight
 X-AW-Height=25
 X-AW-Width=100
-X-AW-ApiVersion=3
+X-AW-ApiVersion=4
 X-AW-Number=0
diff --git a/sources/awesomewidgets/desktops/aw-mem-bar.desktop b/sources/awesomewidgets/desktops/aw-mem-bar.desktop
index 4f4f92a..d76fa22 100644
--- a/sources/awesomewidgets/desktops/aw-mem-bar.desktop
+++ b/sources/awesomewidgets/desktops/aw-mem-bar.desktop
@@ -3,11 +3,14 @@ Encoding=UTF-8
 Name=bar1
 Comment=Simple mem bar
 X-AW-Value=mem
+X-AW-Custom=false
+X-AW-Max=100.0
+X-AW-Min=0.0
 X-AW-ActiveColor="0,0,0,255"
 X-AW-InactiveColor="255,255,255,255"
 X-AW-Type=Horizontal
 X-AW-Direction=LeftToRight
 X-AW-Height=25
 X-AW-Width=100
-X-AW-ApiVersion=3
+X-AW-ApiVersion=4
 X-AW-Number=1
diff --git a/sources/awesomewidgets/desktops/aw-swap-bar.desktop b/sources/awesomewidgets/desktops/aw-swap-bar.desktop
index 95f3b9a..ee957ee 100644
--- a/sources/awesomewidgets/desktops/aw-swap-bar.desktop
+++ b/sources/awesomewidgets/desktops/aw-swap-bar.desktop
@@ -3,11 +3,14 @@ Encoding=UTF-8
 Name=bar2
 Comment=Simple swap bar
 X-AW-Value=swap
+X-AW-Custom=false
+X-AW-Max=100.0
+X-AW-Min=0.0
 X-AW-ActiveColor="0,0,0,255"
 X-AW-InactiveColor="255,255,255,255"
 X-AW-Type=Horizontal
 X-AW-Direction=LeftToRight
 X-AW-Height=25
 X-AW-Width=100
-X-AW-ApiVersion=3
+X-AW-ApiVersion=4
 X-AW-Number=2
diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp
index 44f33cd..7a43d7e 100644
--- a/sources/extsysmon/extsysmonaggregator.cpp
+++ b/sources/extsysmon/extsysmonaggregator.cpp
@@ -57,12 +57,14 @@ QVariant ExtSysMonAggregator::data(const QString source) const
 {
     qCDebug(LOG_ESM) << "Source" << source;
 
-    return hasSource(source) ? m_map[source]->data(source) : QVariant();
+    return m_map[source]->data(source);
 }
 
 
 bool ExtSysMonAggregator::hasSource(const QString source) const
 {
+    qCDebug(LOG_ESM) << "Source" << source;
+
     return m_map.contains(source);
 }
 
@@ -78,9 +80,7 @@ QVariantMap ExtSysMonAggregator::initialData(const QString source) const
 
 QStringList ExtSysMonAggregator::sources() const
 {
-    QStringList sorted = m_map.keys();
-    sorted.sort();
-    return sorted;
+    return m_map.keys();
 }
 
 
diff --git a/sources/extsysmon/sources/batterysource.cpp b/sources/extsysmon/sources/batterysource.cpp
index 70ee6e2..647b3f3 100644
--- a/sources/extsysmon/sources/batterysource.cpp
+++ b/sources/extsysmon/sources/batterysource.cpp
@@ -88,7 +88,7 @@ void BatterySource::run()
             = (QString(acFile.readLine()).trimmed().toInt() == 1);
     acFile.close();
 
-    // batterites
+    // batteries
     float currentLevel = 0.0;
     float fullLevel = 0.0;
     for (int i = 0; i < m_batteriesCount; i++) {