diff --git a/meta/openhab.tmLanguage.json b/meta/openhab.tmLanguage.json
index b420869..99c5d78 100644
--- a/meta/openhab.tmLanguage.json
+++ b/meta/openhab.tmLanguage.json
@@ -360,11 +360,11 @@
                     "name": "variable.language.openhab"
                 },
                 {
-                    "match": "\\b(Color|Contact|DateTime|Dimmer|Group|Number|Player|Rollershutter|String|Switch|Location)\\b",
+                    "match": "\\b(Color|Contact|DateTime|Dimmer|Group|Number:[a-zA-Z]*|Number|Player|Rollershutter|String|Switch|Location)\\b",
                     "name": "variable.language.openhab"
                 },
                 {
-                    "match": "\\b(Frame|Default|Text|Group|Switch|Selection|Setpoint|Slider|Colorpicker|Chart|Webview|Image|Video)\\b",
+                    "match": "\\b(Frame|Default|Text|Group|Switch|Buttongrid|Button|Selection|Setpoint|Slider|Colorpicker|Colortemperaturepicker|Input|Chart|Webview|Mapview|Image|Video)\\b",
                     "name": "variable.language.openhab"
                 },
                 {
diff --git a/snippets/openhab.json b/snippets/openhab.json
index 421d0f1..6845daf 100644
--- a/snippets/openhab.json
+++ b/snippets/openhab.json
@@ -15,7 +15,7 @@
     },
     "item-in-sitemap": {
         "prefix": "item-in-sitemap",
-        "body": "${1|Chart,Colorpicker,Default,Frame,Group,Image,Mapview,Selection,Setpoint,Slider,Switch,Text,Video,Webview|} item=${2:Item_ID} label=\"${3:Item Label}\" icon=\"${3:icon}\"",
+        "body": "${1|Buttongrid,Button,Chart,Colorpicker,Colortemperaturepicker,Default,Frame,Group,Image,Input,Mapview,Selection,Setpoint,Slider,Switch,Text,Video,Webview|} item=${2:Item_ID} label=\"${3:Item Label}\" icon=\"${3:icon}\"",
         "description": "Generic openHAB Item snippet to put in *.sitemap"
     }
 }
\ No newline at end of file