diff --git a/sentences/en/_common.yaml b/sentences/en/_common.yaml
index 957c9ddec4..9f22835210 100644
--- a/sentences/en/_common.yaml
+++ b/sentences/en/_common.yaml
@@ -377,14 +377,14 @@ expansion_rules:
   how_many: "how many[ of the]"
   brightness: "{brightness}[[ ]%| percent]"
   light: "[the ](light|lights|lighting|lamp|lamps)"
-  turn: "(turn|switch|change)"
+  turn: "(turn|switch|change|bring)"
   temp: "(temp|temperature)"
   temperature: "{temperature}[([ ]°[ ][{temperature_unit}])|( degrees[ {temperature_unit}])]"
   open: "(open|raise|lift)[ up]"
   close: "(close|shut|lower)[ (up|down)]"
   set: "(set|make|change|turn)"
   numeric_value_set: "(set|change|turn[ (up|down)]|increase|decrease|make)"
-  in: "(in|on|at|of)"
+  in: "(in|on|at|of|across|around|throughout)"
   position: "{position}[[ ]%| percent]"
   volume: "{volume:volume_level}[[ ]%| percent]"
   currently: "(currently|presently|right now|at the moment)"
@@ -394,8 +394,8 @@ expansion_rules:
   all: "(all[[ of] the]|every[ single]|each[ and every])"
   are_all: "[<are> ]<all>"
   home: "(home|house|appartment|flat)"
-  everywhere: "(everywhere|in (all|each)[[ of] the] room[s]|in every room[s]|in the <home>)"
-  here: "(here|in here|in this room|in the room)"
+  everywhere: "(everywhere|all over|[<in>] the [(entire|whole)] <home>|[<in>] <all> (room|area|floor)[s])"
+  here: "([in] here|[in] (this|the) (room|area|space))"
 
   # Questions
   what_is_the_class_of_name: "(<what_is> the <class> (of|in|from|(indicated|measured) by) <name> [in <area>]|<what_is> <name>['s] <class> [in <area>]|<what_is> <area> <name>['s] <class>)"
@@ -416,4 +416,9 @@ expansion_rules:
 skip_words:
   - "please"
   - "can you"
+  - "could you"
   - "would you"
+  - "for me"
+  - "i'd like"
+  - "i'd like to"
+  - "i want"
diff --git a/sentences/en/light_HassTurnOff.yaml b/sentences/en/light_HassTurnOff.yaml
index 42609657cf..80b6f2b340 100644
--- a/sentences/en/light_HassTurnOff.yaml
+++ b/sentences/en/light_HassTurnOff.yaml
@@ -2,72 +2,86 @@ language: "en"
 intents:
   HassTurnOff:
     data:
+      # Turn off a specific light
       - sentences:
-          - "<turn> off (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
-          - "[<turn>] (<area> <name> <light_devices>|<name> <light_devices> [in <area>]) [to] off"
-          - "deactivate (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
-        expansion_rules:
-          light_devices: "(light[s]|[light] switch[es])"
+          - "<turn> off <area_floor> <name> <light>"
+          - "<turn> off <name> <light> [<in_area_floor>]"
+          - "[<turn>] <area_floor> <name> <light> [to] off"
+          - "[<turn>] <name> <light> [<in_area_floor>] [to] off"
+          - "deactivate <area_floor> <name> <light>"
+          - "deactivate <name> <light> [<in_area_floor>]"
         requires_context:
           domain: "light"
+
+      # Turn off all lights in an area
       - sentences:
-          - "<turn> off [all] <light> in <area>"
-          - "<turn> off [all] <area> <light>"
-          - "[<turn>] [all] <area> <light> off"
-          - "[<turn>] [all] <light> [in] <area> off"
-          - "deactivate [all] <light> [in] <area>"
-          - "deactivate [all] <area> <light>"
+          - "<area> <light> (off|out)"
+          - "<light> (off|out) [in] <area>"
+          - "<turn> (off|out) [<all>] <area> <light>"
+          - "<turn> (off|out) [<all>] <light> <in> <area>"
+          - "[<turn>] [<all>] <area> <light> (off|out)"
+          - "[<turn>] [<all>] <light> <in> <area> (off|out)"
+          - "[<turn>] [<all>] <light> (off|out) <in> <area>"
+          - "deactivate [<all>] <area> <light>"
+          - "deactivate [<all>] <light> <in> <area>"
+          - "<turn> (off|out) [all] <light> in <area>"
+          - "<turn> (off|out) [all] <area> <light>"
+          - "[<turn>] [all] <area> <light> (off|out)"
+          - "[<turn>] [all] <light> [in] <area> (off|out)"
           - "<light> (off|out) in <area>"
           - "<area> <light> (off|out)"
         slots:
           domain: "light"
         response: "lights_area"
 
+      # Turn off all lights on a floor
+      - sentences:
+          - "<floor> <light> (off|out)"
+          - "<light> (off|out) [<in>] <floor>"
+          - "<turn> (off|out) [<all>] <floor> <light>"
+          - "<turn> (off|out) [<all>] <light> [<in>] <floor>"
+          - "[<turn>] [<all>] <floor> <light> (off|out)"
+          - "[<turn>] [<all>] <light> [<in>] <floor> (off|out)"
+          - "[<turn>] [<all>] <light> (off|out) [<in>] <floor>"
+          - "deactivate [<all>] <floor> <light>"
+          - "deactivate [<all>] <light> [<in>] <floor>"
+        response: "lights_floor"
+        slots:
+          domain: "light"
+
       # Turn off all lights in the home
       - sentences:
-          - "<turn> <light> off <everywhere>"
-          - "<turn> <all> <light> off <everywhere>"
-          - "<turn> <all> <light> off"
-          - "<turn> off <all> <light> <everywhere>"
-          - "<turn> off <light> <everywhere>"
-          - "<turn> off <all> <light>"
-          - "deactivate <all> <light> <everywhere>"
+          - "<turn> <all> <light> (off|out) [<everywhere>]"
+          - "<turn> <light> (off|out) <everywhere>"
+          - "<turn> (off|out) <all> <light> [<everywhere>]"
+          - "<turn> (off|out) <light> <everywhere>"
+          - "<turn> (off|out) [<all>] [the] <home> <light> <everywhere>"
+          - "deactivate <all> <light> [<everywhere>]"
           - "deactivate <light> <everywhere>"
-          - "deactivate <all> <light>"
+          - "get every <light> (off|out) [<everywhere>]"
+          - "make sure <all> <light> <is> (off|out)"
         response: "light_all"
         slots:
           domain: "light"
 
       # Turn off lights in the same area as a satellite device
       - sentences:
-          - "<turn> <all> <light> off <here>"
-          - "<turn> <all> <light> <here> off"
-          - "<turn> off <all> <light> <here>"
-          - "<turn> off <light> <here>"
-          - "<turn> off <light>"
-          - "<turn> <light> off <here>"
-          - "<turn> <light> <here> off"
-          - "<turn> <light> off"
-          - "deactivate <all> <light> <here>"
-          - "deactivate <light> <here>"
-          - "deactivate <light>"
-          - "<light> (off|out)"
+          # Explicit <here> optional all
+          - "<turn> [<all>] <light> (off|out) <here>"
+          - "<turn> [<all>] <light> <here> (off|out)"
+          - "<turn> (off|out) [<all>] <light> <here>"
+          - "deactivate [<all>] <light> <here>"
+          - "[<all>] <light> (off|out) <here>"
+
+          # Implicit <here> no all
+          - "<turn> <light> (off|out) [<here>]"
+          - "<turn> <light> [<here>] (off|out)"
+          - "<turn> (off|out) <light> [<here>]"
+          - "deactivate <light> [<here>]"
+          - "<light> (off|out) [<here>]"
         response: "lights_area"
         slots:
           domain: "light"
         requires_context:
           area:
             slot: true
-
-      # Turn off all lights on a floor
-      - sentences:
-          - "<turn> off <all> <light> (on|in) <floor>"
-          - "<turn> off <all> <light> <floor>"
-          - "<turn> off <all> <floor> <light>"
-          - "<turn> <floor> <light> off"
-          - "<floor> <light> off"
-          - "deactivate <all> <floor> <light>"
-          - "deactivate <all> <light> (on|in) <floor>"
-        response: "lights_floor"
-        slots:
-          domain: "light"
diff --git a/sentences/en/light_HassTurnOn.yaml b/sentences/en/light_HassTurnOn.yaml
index 5f9f9cc18c..5599772f41 100644
--- a/sentences/en/light_HassTurnOn.yaml
+++ b/sentences/en/light_HassTurnOn.yaml
@@ -1,72 +1,92 @@
+---
 language: "en"
 intents:
   HassTurnOn:
     data:
+      # Turn on a specific light
       - sentences:
-          - "<turn> on (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
-          - "[<turn>] (<area> <name> <light_devices>|<name> <light_devices> [in <area>]) [to] on"
-          - "activate (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
-        expansion_rules:
-          light_devices: "(light[s]|[light] switch[es])"
+          - "<turn> on <area_floor> <name> <light>"
+          - "<turn> on <name> <light> [<in_area_floor>]"
+          - "[<turn>] <area_floor> <name> <light> [to] on"
+          - "[<turn>] <name> <light> [<in_area_floor>] [to] on"
+          - "activate <area_floor> <name> <light>"
+          - "activate <name> <light> [<in_area_floor>]"
+          - "light up <area_floor> <name> <light>"
+          - "light up <name> <light> [<in_area_floor>]"
         requires_context:
           domain: "light"
+
+      # Turn on all lights in an area
       - sentences:
-          - "<turn> on [all] <light> in <area>"
-          - "<turn> on [all] <area> <light>"
-          - "[<turn>] [all] <area> <light> on"
-          - "[<turn>] [all] <light> [in] <area> on"
-          - "activate [all] <light> [in] <area>"
-          - "activate [all] <area> <light>"
-          - "<light> on in <area>"
+          - "(light up|illuminate) <area>"
+          - "<area> <light> on"
+          - "<light> on [in] <area>"
+          - "<turn> on [<all>] <area> <light>"
+          - "<turn> on [<all>] <light> <in> <area>"
+          - "[<turn>] [<all>] <area> <light> on"
+          - "[<turn>] [<all>] <light> <in> <area> on"
+          - "[<turn>] [<all>] <light> on <in> <area>"
+          - "activate [<all>] <area> <light>"
+          - "activate [<all>] <light> <in> <area>"
         slots:
           domain: "light"
         response: "lights_area"
 
+      # Turn on all lights on a floor
+      - sentences:
+          - "(light up|illuminate) <floor>"
+          - "<floor> <light> on"
+          - "<light> on [<in>] <floor>"
+          - "<turn> on [<all>] <floor> <light>"
+          - "<turn> on [<all>] <light> [<in>] <floor>"
+          - "[<turn>] [<all>] <floor> <light> on"
+          - "[<turn>] [<all>] <light> [<in>] <floor> on"
+          - "[<turn>] [<all>] <light> on [<in>] <floor>"
+          - "activate [<all>] <floor> <light>"
+          - "activate [<all>] <light> [<in>] <floor>"
+        response: "lights_floor"
+        slots:
+          domain: "light"
+
       # Turn on all lights in the home
       - sentences:
-          - "<turn> <all> <light> on <everywhere>"
-          - "<turn> on <all> <light> <everywhere>"
-          - "activate <all> <light> <everywhere>"
+          - "(light up|activate|illuminate) <all> <light> <everywhere>"
+          - "(light up|illuminate) the (entire|whole) <home>"
+          - "(light up|illuminate) <everywhere> [<everywhere>]"
+          - "<turn> <all> <light> on [<everywhere>]"
           - "<turn> <light> on <everywhere>"
+          - "<turn> on <all> <light> [<everywhere>]"
           - "<turn> on <light> <everywhere>"
+          - "<turn> on [<all>] [the] <home> <light> <everywhere>"
+          - "activate <all> <light> [<everywhere>]"
           - "activate <light> <everywhere>"
-          - "<turn> <all> <light> on"
-          - "<turn> on <all> <light>"
-          - "activate <all> <light>"
+          - "get every <light> on [<everywhere>]"
+          - "illuminate <all> areas [<everywhere>]"
+          - make sure <all> <light> <is> on
         response: "light_all"
         slots:
           domain: "light"
 
       # Turn on lights in the same area as a satellite device
       - sentences:
-          - "<turn> <all> <light> on <here>"
-          - "<turn> <light> on <here>"
-          - "<turn> <all> <light> <here> on"
-          - "<turn> <light> <here> on"
-          - "<turn> on <all> <light> <here>"
-          - "<turn> on <light> <here>"
-          - "activate <all> <light> <here>"
-          - "activate <light> <here>"
-          - "<turn> <light> on"
-          - "<turn> on <light>"
-          - "activate <light>"
-          - "<light> on"
+          # Explicit <here> optional all
+          - "<turn> [<all>] <light> on <here>"
+          - "<turn> [<all>] <light> <here> on"
+          - "<turn> on [<all>] <light> <here>"
+          - "activate [<all>] <light> <here>"
+          - "[<all>] <light> on <here>"
+
+          # Implicit <here> no all
+          - "<turn> <light> on [<here>]"
+          - "<turn> <light> [<here>] on"
+          - "<turn> on <light> [<here>]"
+          - "activate <light> [<here>]"
+          - "<light> on [<here>]"
+          - "light (it|<here>) up"
+          - "light up [<here>]"
         response: "lights_area"
         slots:
           domain: "light"
         requires_context:
           area:
             slot: true
-
-      # Turn on all lights on a floor
-      - sentences:
-          - "<turn> on <all> <light> (on|in) <floor>"
-          - "<turn> on <all> <light> <floor>"
-          - "<turn> on <all> <floor> <light>"
-          - "<turn> <floor> <light> on"
-          - "<floor> <light> on"
-          - "activate <all> <floor> <light>"
-          - "activate <all> <light> (on|in) <floor>"
-        response: "lights_floor"
-        slots:
-          domain: "light"
diff --git a/tests/en/light_HassTurnOff.yaml b/tests/en/light_HassTurnOff.yaml
index 40302cc6a4..ed29f632a8 100644
--- a/tests/en/light_HassTurnOff.yaml
+++ b/tests/en/light_HassTurnOff.yaml
@@ -2,29 +2,41 @@ language: en
 tests:
   # Turn off all lights in an area
   - sentences:
-      - "turn off all the lights in the kitchen"
-      - "turn off all the lights in kitchen"
-      - "turn off the light in the kitchen"
-      - "turn off the light in kitchen"
-      - "turn off the lights in the kitchen"
-      - "turn off lighting in kitchen"
-      - "turn off all kitchen lights"
-      - "turn off kitchen light"
-      - "turn off kitchen lights"
-      - "turn off the kitchen light"
-      - "turn off all the kitchen lights"
-      - "turn all the lights in the kitchen off"
-      - "turn all the lights in kitchen off"
-      - "turn lights in the kitchen off"
-      - "turn the lights in the kitchen off"
-      - "turn the lights in kitchen off"
-      - "turn the light in the kitchen off"
-      - "turn the light in kitchen off"
-      - "turn the kitchen lights off"
-      - "kitchen lighting off"
-      - "deactivate kitchen lights"
-      - "light off in the kitchen"
-      - "kitchen lights out"
+      - can you switch off the kitchen lights?
+      - can you turn the lights off in the kitchen?
+      - could you turn off the kitchen lights?
+      - deactivate kitchen lights
+      - deactivate the lights in the kitchen
+      - kitchen lighting off
+      - kitchen lights off
+      - kitchen lights off please
+      - kitchen lights out
+      - light off in the kitchen
+      - please turn off the lights in the kitchen
+      - switch off the lights in the kitchen
+      - turn all the lights in kitchen off
+      - turn all the lights in the kitchen off
+      - turn lights in the kitchen off
+      - turn off all kitchen lights
+      - turn off all the kitchen lights
+      - turn off all the lights in kitchen
+      - turn off all the lights in the kitchen
+      - turn off kitchen light
+      - turn off kitchen lights
+      - turn off lighting in kitchen
+      - turn off the kitchen light
+      - turn off the kitchen lights
+      - turn off the light in kitchen
+      - turn off the light in the kitchen
+      - turn off the lights in kitchen
+      - turn off the lights in the kitchen
+      - turn off the lights in the kitchen for me
+      - turn the kitchen lights off
+      - turn the light in kitchen off
+      - turn the light in the kitchen off
+      - turn the lighting in the kitchen off
+      - turn the lights in kitchen off
+      - turn the lights in the kitchen off
     intent:
       name: HassTurnOff
       slots:
@@ -34,19 +46,33 @@ tests:
 
   # Turn off all lights in the home
   - sentences:
-      - Turn all lights off in the appartment
-      - Switch off every light in the home
-      - Deactivate each and every lights everywhere
-      - Turn the lights off in the house
-      - Switch off the lights in every room
-      - Deactivate the lights in the home
-      - Turn all lights off
-      - Turn off every light
-      - Deactivate each light
-      - Turn the lights off in all the rooms
-      - Turn all lighting off
-      - Deactivate every single light
-      - Deactivate lights in each room
+      - can you turn off all the lights in the house?
+      - deactivate each and every light everywhere
+      - deactivate each and every lights everywhere
+      - deactivate each light
+      - deactivate every single light
+      - deactivate lights in each room
+      - deactivate the lights in the home
+      - make sure every light is off
+      - please deactivate the lights all over
+      - please turn off all the lights everywhere
+      - switch off all the lights in the house
+      - switch off every light in the home
+      - switch off every single light in the home
+      - switch off the lights in every room
+      - turn all lighting off
+      - turn all lights off
+      - turn all lights off in the appartment
+      - turn every light off across the house
+      - turn off all lights across every room
+      - turn off all lights in the entire home
+      - turn off all lights throughout the home
+      - turn off all the lights in the home
+      - turn off every light
+      - turn off lights in every area
+      - turn off the house lights everywhere
+      - turn the lights off in all the rooms
+      - turn the lights off in the house
     intent:
       name: HassTurnOff
       slots:
@@ -54,18 +80,30 @@ tests:
 
   # Turn off lights in the same area as a satellite device
   - sentences:
-      - Turn every light off in this room
-      - Turn the lights off here
-      - Turn every light in here off
-      - Turn the lights in here off
-      - Switch off each and every light in the room
-      - Switch off the lights in this room
-      - Deactivate all the lights here
-      - Deactivate the lights in this room
-      - Turn the lights off
-      - Turn off the lights
-      - Deactivate the lights
-      - Lights out
+      - bring off all the lights here
+      - can you turn off the lights here?
+      - deactivate all the lights here
+      - deactivate the lights
+      - deactivate the lights in this room
+      - i want all the lights off in this room
+      - lights off
+      - lights off in here please
+      - lights out
+      - please turn every light off in here
+      - please turn the lights off in here
+      - switch all the lights off in here
+      - switch off all lights in this room
+      - switch off each and every light in the room
+      - switch off the lights in this room
+      - turn every light in here off
+      - turn every light off in this room
+      - turn off all lights here
+      - turn off each light in this room
+      - turn off the lights
+      - turn off the lights in this space
+      - turn the lights in here off
+      - turn the lights off
+      - turn the lights off here
     intent:
       name: HassTurnOff
       context:
@@ -77,13 +115,41 @@ tests:
 
   # Turn off all lights on a floor
   - sentences:
-      - Turn off all the lights on the first floor
-      - Turn off all the lights first floor
-      - Switch off all first floor lights
-      - Turn first floor lights off
-      - First floor lights off
-      - Deactivate all first floor lights
-      - Deactivate all lights on the first floor
+      - can you switch off the first floor lights?
+      - can you turn the lights off in the first floor?
+      - could you turn off the first floor lights?
+      - deactivate all first floor lights
+      - deactivate all lights on the first floor
+      - deactivate first floor lights
+      - deactivate the lights in the first floor
+      - first floor lighting off
+      - first floor lights off
+      - first floor lights off please
+      - please turn off the lights in the first floor
+      - switch off all first floor lights
+      - switch off the lights in the first floor
+      - turn all the lights in first floor off
+      - turn all the lights in the first floor off
+      - turn first floor lights off
+      - turn lights in the first floor off
+      - turn off all first floor lights
+      - turn off all the first floor lights
+      - turn off all the lights first floor
+      - turn off all the lights in first floor
+      - turn off all the lights on the first floor
+      - turn off first floor lights
+      - turn off the first floor lights
+      - turn off the lamp in the first floor
+      - turn off the light in first floor
+      - turn off the light in the first floor
+      - turn off the lights in first floor
+      - turn off the lights in the first floor
+      - turn off the lights in the first floor for me
+      - turn the first floor lights off
+      - turn the light in first floor off
+      - turn the light in the first floor off
+      - turn the lighting in the first floor off
+      - turn the lights in first floor off
     intent:
       name: HassTurnOff
       slots:
diff --git a/tests/en/light_HassTurnOn.yaml b/tests/en/light_HassTurnOn.yaml
index 2ab34f55f2..b95fa41feb 100644
--- a/tests/en/light_HassTurnOn.yaml
+++ b/tests/en/light_HassTurnOn.yaml
@@ -2,30 +2,40 @@ language: en
 tests:
   # Turn on all lights in an area
   - sentences:
-      - "turn on all the lights in the living room"
-      - "turn on all the lights in living room"
-      - "turn on the light in the living room"
-      - "turn on the light in living room"
-      - "turn on the lights in the living room"
-      - "turn on the lights in living room"
-      - "turn on all living room lights"
-      - "turn on living room light"
-      - "turn on living room lights"
-      - "turn on the living room light"
-      - "turn on all the living room lights"
-      - "turn all the lights in the living room on"
-      - "turn all the lights in living room on"
-      - "turn lights in the living room on"
-      - "turn the lighting in the living room on"
-      - "turn the lights in living room on"
-      - "turn the light in the living room on"
-      - "turn the light in living room on"
-      - "turn the living room lights on"
-      - "living room lights on"
-      - "activate living room lights"
-      - "lights living room on"
-      - "living room lighting on"
-      - "light on in the living room"
+      - activate living room lights
+      - activate the lights in the living room
+      - can you switch on the living room lights?
+      - can you turn the lights on in the living room?
+      - could you turn on the living room lights?
+      - light up the living room
+      - light up the living room for me
+      - living room lighting on
+      - living room lights on
+      - living room lights on please
+      - please turn on the lights in the living room
+      - switch on the lights in the living room
+      - turn all the lights in living room on
+      - turn all the lights in the living room on
+      - turn lights in the living room on
+      - turn on all living room lights
+      - turn on all the lights in living room
+      - turn on all the lights in the living room
+      - turn on all the living room lights
+      - turn on living room light
+      - turn on living room lights
+      - turn on the light in living room
+      - turn on the light in the living room
+      - turn on the lights in living room
+      - turn on the lights in the living room
+      - turn on the lights in the living room for me
+      - turn on the living room light
+      - turn on the living room lights
+      - turn the light in living room on
+      - turn the light in the living room on
+      - turn the lighting in the living room on
+      - turn the lights in living room on
+      - turn the living room lights on
+
     intent:
       name: HassTurnOn
       slots:
@@ -35,19 +45,37 @@ tests:
 
     # Turn on all lights in the home
   - sentences:
-      - Turn all lights on in the appartment
-      - Switch on every light in the home
-      - Activate each and every light everywhere
-      - Turn the lights on in the house
-      - Switch on the lights in every room
-      - Activate the lights in the home
-      - Turn all lights on
-      - Turn on every light
-      - Activate each light
-      - Turn the lights on in all the rooms
-      - Turn all lighting on
-      - Activate every single light
-      - Activate lights in each room
+      - activate each and every light everywhere
+      - activate each light
+      - activate every single light
+      - activate lights in each room
+      - activate the lights in the home
+      - can you turn on all the lights in the house?
+      - illuminate all areas in the house
+      - illuminate the entire home
+      - light up each room in the home
+      - light up the whole house
+      - make sure every light is on
+      - please activate the lights all over
+      - please turn on all the lights everywhere
+      - switch on all the lights in the house
+      - switch on every light in the home
+      - switch on every single light in the home
+      - switch on the lights in every room
+      - turn all lighting on
+      - turn all lights on
+      - turn all lights on in the appartment
+      - turn every light on across the house
+      - turn on all lights across every room
+      - turn on all lights in the entire home
+      - turn on all lights throughout the home
+      - turn on all the lights in the home
+      - turn on every light
+      - turn on lights in every area
+      - turn on the house lights everywhere
+      - turn the lights on in all the rooms
+      - turn the lights on in the house
+
     intent:
       name: HassTurnOn
       slots:
@@ -55,18 +83,32 @@ tests:
 
   # Turn on lights in the same area as a satellite device
   - sentences:
-      - Turn every light on in this room
-      - Turn the lights on here
-      - Turn every light in here on
-      - Turn the lights in here on
-      - Switch on each and every light in the room
-      - Switch on the lights in this room
-      - Activate all the lights here
-      - Activate the lights in this room
-      - Turn the lights on
-      - Turn on the lights
-      - Activate the lights
-      - Lights on
+      - activate all the lights here
+      - activate the lights
+      - activate the lights in this room
+      - bring on all the lights here
+      - can you turn on the lights here?
+      - i want all the lights on in this room
+      - light this room up
+      - light up this room
+      - lights on
+      - lights on in here please
+      - please turn every light on in here
+      - please turn the lights on in here
+      - switch all the lights on in here
+      - switch on all lights in this room
+      - switch on each and every light in the room
+      - switch on the lights in this room
+      - turn every light in here on
+      - turn every light on in this room
+      - turn on all lights here
+      - turn on each light in this room
+      - turn on the lights
+      - turn on the lights in this space
+      - turn the lights in here on
+      - turn the lights on
+      - turn the lights on here
+
     intent:
       name: HassTurnOn
       context:
@@ -78,13 +120,40 @@ tests:
 
   # Turn on all lights on a floor
   - sentences:
-      - Turn on all the lights on the first floor
-      - Turn on all the lights first floor
-      - Switch on all first floor lights
-      - Turn first floor lights on
-      - First floor lights on
-      - Activate all first floor lights
-      - Activate all lights on the first floor
+      - activate first floor lights
+      - activate the lights in the first floor
+      - can you switch on the first floor lights?
+      - can you turn the lights on in the first floor?
+      - could you turn on the first floor lights?
+      - first floor lighting on
+      - first floor lights on
+      - first floor lights on please
+      - light up the first floor
+      - light up the first floor for me
+      - please turn on the lights in the first floor
+      - switch on the lights in the first floor
+      - turn all the lights in first floor on
+      - turn all the lights in the first floor on
+      - turn lights in the first floor on
+      - turn on all first floor lights
+      - turn on all the first floor lights
+      - turn on all the lights in first floor
+      - turn on all the lights in the first floor
+      - turn on first floor light
+      - turn on first floor lights
+      - turn on the first floor light
+      - turn on the first floor lights
+      - turn on the lamp in the first floor
+      - turn on the light in first floor
+      - turn on the light in the first floor
+      - turn on the lights in first floor
+      - turn on the lights in the first floor
+      - turn on the lights in the first floor for me
+      - turn the first floor lights on
+      - turn the light in first floor on
+      - turn the light in the first floor on
+      - turn the lighting in the first floor on
+      - turn the lights in first floor on
     intent:
       name: HassTurnOn
       slots: