diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
index 5be8b5df..1e681580 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
@@ -107,7 +107,7 @@
 DevicePluginDateTime::DevicePluginDateTime() :
     m_timer(0),
     m_todayDevice(0),
-    m_timeZone(QTimeZone("Europe/Vienna")),
+    m_timeZone(QTimeZone(QTimeZone::systemTimeZoneId())),
     m_dusk(QDateTime()),
     m_sunrise(QDateTime()),
     m_noon(QDateTime()),
@@ -117,11 +117,9 @@ DevicePluginDateTime::DevicePluginDateTime() :
     m_timer = new QTimer(this);
     m_timer->setInterval(1000);
 
-    m_timeZone = QTimeZone(QTimeZone::systemTimeZoneId());
     m_currentDateTime = QDateTime(QDate::currentDate(), QTime::currentTime(), m_timeZone);
 
     connect(m_timer, &QTimer::timeout, this, &DevicePluginDateTime::onSecondChanged);
-    connect(this, &DevicePluginDateTime::configValueChanged, this, &DevicePluginDateTime::onConfigValueChanged);
 }
 
 DeviceManager::HardwareResources DevicePluginDateTime::requiredHardware() const
@@ -129,21 +127,6 @@ DeviceManager::HardwareResources DevicePluginDateTime::requiredHardware() const
     return DeviceManager::HardwareResourceNetworkManager;
 }
 
-//QList<ParamType> DevicePluginDateTime::configurationDescription() const
-//{
-//    QList<ParamType> params;
-//    ParamType timezoneParamType("timezone", QVariant::String, "Europe/Vienna");
-
-//    QList<QVariant> allowedValues;
-//    foreach (QByteArray timeZone, QTimeZone::availableTimeZoneIds()) {
-//        allowedValues.append(timeZone);
-//    }
-//    timezoneParamType.setAllowedValues(allowedValues);
-
-//    params.append(timezoneParamType);
-//    return params;
-//}
-
 DeviceManager::DeviceSetupStatus DevicePluginDateTime::setupDevice(Device *device)
 {
     // check timezone
@@ -271,14 +254,14 @@ void DevicePluginDateTime::networkManagerReplyReady(QNetworkReply *reply)
     if (m_locationReplies.contains(reply)) {
         m_locationReplies.removeAll(reply);
         if (status != 200) {
-            qCWarning(dcDateTime) << "http error status for location request:" << status << reply->error();
+            qCWarning(dcDateTime) << "Http error status for location request:" << status << reply->error();
         } else {
             processGeoLocationData(reply->readAll());
         }
     } else if (m_timeReplies.contains(reply)) {
         m_timeReplies.removeAll(reply);
         if (status != 200) {
-            qCWarning(dcDateTime) << "http error status for time request:" << status << reply->error();
+            qCWarning(dcDateTime) << "Http error status for time request:" << status << reply->error();
         } else {
             processTimesData(reply->readAll());
         }
@@ -294,9 +277,9 @@ void DevicePluginDateTime::startMonitoringAutoDevices()
         }
     }
 
-    DeviceDescriptor dateDescriptor(todayDeviceClassId, QString("Date"), QString(m_timeZone.id()));
+    DeviceDescriptor dateDescriptor(todayDeviceClassId, "Date", "Time");
     ParamList params;
-    params.append(Param("name", m_timeZone.id()));
+    params.append(Param("name", "Time"));
     dateDescriptor.setParams(params);
 
     emit autoDevicesAppeared(todayDeviceClassId, QList<DeviceDescriptor>() << dateDescriptor);
@@ -334,12 +317,10 @@ void DevicePluginDateTime::processGeoLocationData(const QByteArray &data)
 
     // check timezone
     QString timeZone = response.value("timezone").toString();
-    if (QString(m_timeZone.id()) != timeZone) {
-        qCWarning(dcDateTime) << "error: configured timezone does not match the discovered timezone";
-        qCWarning(dcDateTime) << "    configured:" << m_timeZone.id();
-        qCWarning(dcDateTime) << "    discovered:" << timeZone;
-        return;
-    }
+
+    m_todayDevice->setStateValue(timeZoneStateTypeId, timeZone);
+    m_todayDevice->setStateValue(cityStateTypeId, response.value("city").toString());
+    m_todayDevice->setStateValue(countryStateTypeId, response.value("country").toString());
 
     qCDebug(dcDateTime) << "---------------------------------------------";
     qCDebug(dcDateTime) << "autodetected location for" << response.value("query").toString();
@@ -537,21 +518,6 @@ void DevicePluginDateTime::updateTimes()
     }
 }
 
-void DevicePluginDateTime::onConfigValueChanged(const QString &paramName, const QVariant &value)
-{
-    Q_UNUSED(paramName)
-
-    QTimeZone newZone = QTimeZone(value.toByteArray());
-    if (newZone.isValid()) {
-        m_timeZone = newZone;
-        QDateTime zoneTime = QDateTime(QDate::currentDate(), QTime::currentTime(), m_timeZone);
-        qCDebug(dcDateTime) << "        time zone:" << value.toString();
-        qCDebug(dcDateTime) << "     current time:" << zoneTime.currentDateTime().toString();
-        qCDebug(dcDateTime) << "-----------------------------";
-    } else {
-        qCWarning(dcDateTime) << "could not set new timezone" << value.toString() << ". keeping old time zone:" << m_timeZone;
-    }
-}
 
 void DevicePluginDateTime::validateTimeTypes(const QDateTime &dateTime)
 {
diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.h b/plugins/deviceplugins/datetime/deviceplugindatetime.h
index 4e429d7c..1cafa405 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.h
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.h
@@ -92,7 +92,6 @@ private slots:
 
     void updateTimes();
 
-    void onConfigValueChanged(const QString &paramName, const QVariant &value);
     void validateTimeTypes(const QDateTime &dateTime);
 
 };
diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.json b/plugins/deviceplugins/datetime/deviceplugindatetime.json
index f5d2f6ee..c9fe202e 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.json
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.json
@@ -14,7 +14,6 @@
                     "name": "Today",
                     "basicTags": [
                         "Service",
-                        "Sensor",
                         "Time"
                     ],
                     "createMethods": ["auto"],
@@ -26,19 +25,44 @@
                         }
                     ],
                     "stateTypes": [
+                        {
+                            "id": "ab16997c-be29-438e-b588-2507d723d264",
+                            "idName": "timeZone",
+                            "name": "timezone",
+                            "type": "QString",
+                            "defaultValue": "-"
+                        },
+                        {
+                            "id": "65d2a5ff-bcab-43a8-b043-f88cf01586f4",
+                            "idName": "city",
+                            "name": "city",
+                            "type": "QString",
+                            "defaultValue": "-"
+                        },
+                        {
+                            "id": "a534bd8b-6826-4d71-b9f9-df1433964b94",
+                            "idName": "country",
+                            "name": "country",
+                            "type": "QString",
+                            "defaultValue": "-"
+                        },
                         {
                             "id": "eb5231ea-6a1b-4d7e-a95f-d49e7b25122e",
                             "name": "day",
                             "idName": "day",
                             "type": "int",
-                            "defaultValue": "1"
+                            "defaultValue": 1,
+                            "minValue": 1,
+                            "maxValue": 31
                         },
                         {
                             "id": "fcd8ec96-4488-438a-8b30-58bfe2a7fae2",
                             "name": "month",
                             "idName": "month",
                             "type": "int",
-                            "defaultValue": "1"
+                            "defaultValue": 1,
+                            "minValue": 1,
+                            "maxValue": 12
                         },
                         {
                             "id": "a37acc9c-5cfb-4687-adce-e56beb32586f",
@@ -59,7 +83,9 @@
                             "idName": "weekday",
                             "name": "weekday",
                             "type": "int",
-                            "defaultValue": "1"
+                            "defaultValue": 1,
+                            "minValue": 1,
+                            "maxValue": 7
                         },
                         {
                             "id": "f627d052-cee6-4727-b9c6-0e935d41e04a",