diff --git a/doorbird/doorbird.jpg b/doorbird/doorbird.jpg
new file mode 100644
index 00000000..6819bf14
Binary files /dev/null and b/doorbird/doorbird.jpg differ
diff --git a/doorbird/integrationplugindoorbird.json b/doorbird/integrationplugindoorbird.json
index ac31c717..9c9ba049 100644
--- a/doorbird/integrationplugindoorbird.json
+++ b/doorbird/integrationplugindoorbird.json
@@ -81,7 +81,7 @@
                             "id": "295c9700-b598-4681-898f-d63e2889cedf",
                             "name": "lastSeenTime",
                             "displayName": "Motion sensor last seen time",
-                            "displayNameEvent": "Motion sensor last seen time changedd",
+                            "displayNameEvent": "Motion sensor last seen time changed",
                             "type": "int",
                             "unit": "UnixTime",
                             "defaultValue": 0
diff --git a/doorbird/meta.json b/doorbird/meta.json
new file mode 100644
index 00000000..aeda49d0
--- /dev/null
+++ b/doorbird/meta.json
@@ -0,0 +1,13 @@
+{
+    "title": "DoorBird",
+    "tagline": "Integrates DoorBird doorstations with nymea.",
+    "icon": "doorbird.jpg",
+    "stability": "consumer",
+    "offline": true,
+    "technologies": [
+        "network"
+    ],
+    "categories": [
+        "sensor"
+    ]
+}
diff --git a/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-de.ts b/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-de.ts
new file mode 100644
index 00000000..2369c8ad
--- /dev/null
+++ b/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-de.ts
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>DevicePluginDoorbird</name>
+    <message>
+        <location filename="../deviceplugindoorbird.cpp" line="92"/>
+        <source>Please enter the user credentials</source>
+        <translation>Bitte geben Sie die Benutzeranmeldeinformationen ein</translation>
+    </message>
+</context>
+<context>
+    <name>doorBird</name>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="39"/>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="42"/>
+        <source>Connected</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: connected, ID: {186c270b-923c-46e4-a7da-33e45427cdbb})
+----------
+The name of the StateType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of DeviceClass doorBird</extracomment>
+        <translation>Verbunden</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="45"/>
+        <source>Connected changed</source>
+        <extracomment>The name of the EventType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of DeviceClass doorBird</extracomment>
+        <translation>Verbunden geändert</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="48"/>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="51"/>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="54"/>
+        <source>DoorBird</source>
+        <extracomment>The name of the DeviceClass ({0485eb61-2a22-42ba-9dd2-a5961485bf08})
+----------
+The name of the vendor ({2da07435-571e-4956-a387-6caa51d6e845})
+----------
+The name of the plugin doorBird ({6fe1614a-fc47-4eb2-a47c-13c50f1798ee})</extracomment>
+        <translation>DoorBird</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="57"/>
+        <source>Doorbell pressed</source>
+        <extracomment>The name of the EventType ({9bc89937-a2ab-4e8e-af0e-a9ba41caa89b}) of DeviceClass doorBird</extracomment>
+        <translation>Türklingel gedrückt</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="60"/>
+        <source>IP address</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, Type: device, ID: {8873b17d-526e-408d-95d8-6439b501f489})</extracomment>
+        <translation>IP Adresse</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="63"/>
+        <source>Light on</source>
+        <extracomment>The name of the ActionType ({3a6cfc5d-804c-4d21-91b5-999913d4f1a5}) of DeviceClass doorBird</extracomment>
+        <translation>Licht ein</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="66"/>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="69"/>
+        <source>Motion sensor last seen time</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: lastSeenTime, ID: {295c9700-b598-4681-898f-d63e2889cedf})
+----------
+The name of the StateType ({295c9700-b598-4681-898f-d63e2889cedf}) of DeviceClass doorBird</extracomment>
+        <translation>Bewegungssensor zuletzt gesehene Zeit</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="72"/>
+        <source>Motion sensor last seen time changedd</source>
+        <extracomment>The name of the EventType ({295c9700-b598-4681-898f-d63e2889cedf}) of DeviceClass doorBird</extracomment>
+        <translation>Bewegungssensor zuletzt gesehene Zeit geändert</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="75"/>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="78"/>
+        <source>Motion sensor presence</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: isPresent, ID: {0f5eb200-6c0d-45c5-9156-3060fd66d332})
+----------
+The name of the StateType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of DeviceClass doorBird</extracomment>
+        <translation>Bewegungssensors Aktivität</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="81"/>
+        <source>Motion sensor presence detected</source>
+        <extracomment>The name of the EventType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of DeviceClass doorBird</extracomment>
+        <translation>Bewegungssensor Aktivität geändert</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="84"/>
+        <source>Open door</source>
+        <extracomment>The name of the ActionType ({b6c3377b-91de-411a-9d48-8b509c39d67c}) of DeviceClass doorBird</extracomment>
+        <translation>Tür öffnen</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="87"/>
+        <source>Relay number</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, ActionType: openDoor, ID: {95dd35d7-0bc3-49e1-af96-d8da8ea5244d})</extracomment>
+        <translation>Relaisnummer</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="90"/>
+        <source>Restart</source>
+        <extracomment>The name of the ActionType ({e874242e-5acb-4d98-94c7-0a70db65150c}) of DeviceClass doorBird</extracomment>
+        <translation>Neustarten</translation>
+    </message>
+    <message>
+        <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="93"/>
+        <source>Serial number</source>
+        <extracomment>The name of the ParamType (DeviceClass: doorBird, Type: device, ID: {67ea5534-330a-4291-93b5-0237034e15fa})</extracomment>
+        <translation>Seriennummer</translation>
+    </message>
+</context>
+</TS>
diff --git a/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-en_US.ts b/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-en_US.ts
index 3dbea2ab..13499b31 100644
--- a/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-en_US.ts
+++ b/doorbird/translations/6fe1614a-fc47-4eb2-a47c-13c50f1798ee-en_US.ts
@@ -2,10 +2,16 @@
 <!DOCTYPE TS>
 <TS version="2.1">
 <context>
-    <name>DevicePluginDoorbird</name>
+    <name>IntegrationPluginDoorbird</name>
     <message>
-        <location filename="../deviceplugindoorbird.cpp" line="92"/>
-        <source>Please enter the user credentials</source>
+        <location filename="../integrationplugindoorbird.cpp" line="96"/>
+        <source>Please enter username and password for the DoorBird Thing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../integrationplugindoorbird.cpp" line="283"/>
+        <location filename="../integrationplugindoorbird.cpp" line="288"/>
+        <source>Wrong username or password</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15,15 +21,15 @@
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="39"/>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="42"/>
         <source>Connected</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: connected, ID: {186c270b-923c-46e4-a7da-33e45427cdbb})
+        <extracomment>The name of the ParamType (ThingClass: doorBird, EventType: connected, ID: {186c270b-923c-46e4-a7da-33e45427cdbb})
 ----------
-The name of the StateType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of DeviceClass doorBird</extracomment>
+The name of the StateType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="45"/>
         <source>Connected changed</source>
-        <extracomment>The name of the EventType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the EventType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -31,7 +37,7 @@ The name of the StateType ({186c270b-923c-46e4-a7da-33e45427cdbb}) of DeviceClas
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="51"/>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="54"/>
         <source>DoorBird</source>
-        <extracomment>The name of the DeviceClass ({0485eb61-2a22-42ba-9dd2-a5961485bf08})
+        <extracomment>The name of the ThingClass ({0485eb61-2a22-42ba-9dd2-a5961485bf08})
 ----------
 The name of the vendor ({2da07435-571e-4956-a387-6caa51d6e845})
 ----------
@@ -41,73 +47,73 @@ The name of the plugin doorBird ({6fe1614a-fc47-4eb2-a47c-13c50f1798ee})</extrac
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="57"/>
         <source>Doorbell pressed</source>
-        <extracomment>The name of the EventType ({9bc89937-a2ab-4e8e-af0e-a9ba41caa89b}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the EventType ({9bc89937-a2ab-4e8e-af0e-a9ba41caa89b}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="60"/>
         <source>IP address</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, Type: device, ID: {8873b17d-526e-408d-95d8-6439b501f489})</extracomment>
+        <extracomment>The name of the ParamType (ThingClass: doorBird, Type: thing, ID: {8873b17d-526e-408d-95d8-6439b501f489})</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="63"/>
         <source>Light on</source>
-        <extracomment>The name of the ActionType ({3a6cfc5d-804c-4d21-91b5-999913d4f1a5}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the ActionType ({3a6cfc5d-804c-4d21-91b5-999913d4f1a5}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="66"/>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="69"/>
         <source>Motion sensor last seen time</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: lastSeenTime, ID: {295c9700-b598-4681-898f-d63e2889cedf})
+        <extracomment>The name of the ParamType (ThingClass: doorBird, EventType: lastSeenTime, ID: {295c9700-b598-4681-898f-d63e2889cedf})
 ----------
-The name of the StateType ({295c9700-b598-4681-898f-d63e2889cedf}) of DeviceClass doorBird</extracomment>
+The name of the StateType ({295c9700-b598-4681-898f-d63e2889cedf}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="72"/>
-        <source>Motion sensor last seen time changedd</source>
-        <extracomment>The name of the EventType ({295c9700-b598-4681-898f-d63e2889cedf}) of DeviceClass doorBird</extracomment>
+        <source>Motion sensor last seen time changed</source>
+        <extracomment>The name of the EventType ({295c9700-b598-4681-898f-d63e2889cedf}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="75"/>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="78"/>
         <source>Motion sensor presence</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, EventType: isPresent, ID: {0f5eb200-6c0d-45c5-9156-3060fd66d332})
+        <extracomment>The name of the ParamType (ThingClass: doorBird, EventType: isPresent, ID: {0f5eb200-6c0d-45c5-9156-3060fd66d332})
 ----------
-The name of the StateType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of DeviceClass doorBird</extracomment>
+The name of the StateType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="81"/>
         <source>Motion sensor presence detected</source>
-        <extracomment>The name of the EventType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the EventType ({0f5eb200-6c0d-45c5-9156-3060fd66d332}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="84"/>
         <source>Open door</source>
-        <extracomment>The name of the ActionType ({b6c3377b-91de-411a-9d48-8b509c39d67c}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the ActionType ({b6c3377b-91de-411a-9d48-8b509c39d67c}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="87"/>
         <source>Relay number</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, ActionType: openDoor, ID: {95dd35d7-0bc3-49e1-af96-d8da8ea5244d})</extracomment>
+        <extracomment>The name of the ParamType (ThingClass: doorBird, ActionType: openDoor, ID: {95dd35d7-0bc3-49e1-af96-d8da8ea5244d})</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="90"/>
         <source>Restart</source>
-        <extracomment>The name of the ActionType ({e874242e-5acb-4d98-94c7-0a70db65150c}) of DeviceClass doorBird</extracomment>
+        <extracomment>The name of the ActionType ({e874242e-5acb-4d98-94c7-0a70db65150c}) of ThingClass doorBird</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/doorbird/plugininfo.h" line="93"/>
         <source>Serial number</source>
-        <extracomment>The name of the ParamType (DeviceClass: doorBird, Type: device, ID: {67ea5534-330a-4291-93b5-0237034e15fa})</extracomment>
+        <extracomment>The name of the ParamType (ThingClass: doorBird, Type: thing, ID: {67ea5534-330a-4291-93b5-0237034e15fa})</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>