diff --git a/bundles/org.openhab.ui/web/src/components/pagedesigner/page-settings.vue b/bundles/org.openhab.ui/web/src/components/pagedesigner/page-settings.vue
index e28e360d48..4aa9d3bb49 100644
--- a/bundles/org.openhab.ui/web/src/components/pagedesigner/page-settings.vue
+++ b/bundles/org.openhab.ui/web/src/components/pagedesigner/page-settings.vue
@@ -27,7 +27,7 @@
           </f7-list>
         </f7-accordion-content>
       </f7-list-item>
-      <f7-list-item accordion-item title="Tags" :disabled="page.uid === 'overview'">
+      <f7-list-item accordion-item title="Tags" :disabled="page.uid === 'overview'" :after="(page && page.tags && page.tags.length) ? page.tags.length : ''">
         <f7-accordion-content>
           <tag-input :item="page" />
         </f7-accordion-content>
diff --git a/bundles/org.openhab.ui/web/src/components/rule/rule-general-settings.vue b/bundles/org.openhab.ui/web/src/components/rule/rule-general-settings.vue
new file mode 100644
index 0000000000..f4cd0d7ebb
--- /dev/null
+++ b/bundles/org.openhab.ui/web/src/components/rule/rule-general-settings.vue
@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <f7-block v-if="ready" class="block-narrow">
+      <f7-col>
+        <f7-list inline-labels no-hairlines-md>
+          <f7-list-input label="Unique ID" type="text" placeholder="Required" :value="rule.uid" required validate
+                         :disabled="!createMode" :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
+                         pattern="[A-Za-z0-9_\-]+" error-message="Required. A-Z,a-z,0-9,_,- only"
+                         @input="rule.uid = $event.target.value" :clear-button="createMode" />
+          <f7-list-input label="Name" type="text" placeholder="Required" :value="rule.name" required validate
+                         :disabled="!isEditable" @input="rule.name = $event.target.value" :clear-button="isEditable" />
+          <f7-list-input label="Description" type="text" :value="rule.description"
+                         :disabled="!isEditable" @input="rule.description = $event.target.value" :clear-button="isEditable" />
+          <f7-list-item v-if="(isEditable || rule.tags.length > 0) && (!createMode || !hasRuleTemplate)" accordion-item title="Tags" :after="numberOfTags" :disabled="!isEditable">
+            <f7-accordion-content>
+              <tag-input :item="rule" :showSemanticTags="true" :inScriptEditor="inScriptEditor" :inSceneEditor="inSceneEditor" />
+            </f7-accordion-content>
+          </f7-list-item>
+        </f7-list>
+      </f7-col>
+    </f7-block>
+
+    <!-- skeletons for not ready-->
+    <f7-block v-else class="block-narrow">
+      <f7-col class="skeleton-text skeleton-effect-blink">
+        <f7-list inline-labels no-hairlines-md>
+          <f7-list-input label="Unique ID" type="text" placeholder="Required" value="_______" required validate
+                         :disabled="true" :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
+                         @input="rule.uid = $event.target.value" :clear-button="createMode" />
+          <f7-list-input label="Name" type="text" placeholder="Required" required validate
+                         :disabled="true" @input="rule.name = $event.target.value" :clear-button="isEditable" />
+          <f7-list-input label="Description" type="text" value="__ _____ ___ __ ___"
+                         :disabled="true" @input="rule.description = $event.target.value" :clear-button="isEditable" />
+          <f7-list-item accordion-item title="Tags" :disabled="!isEditable">
+            <f7-accordion-content>
+              <tag-input :item="rule" :showSemanticTags="true" />
+            </f7-accordion-content>
+          </f7-list-item>
+        </f7-list>
+      </f7-col>
+    </f7-block>
+  </div>
+</template>
+
+<script>
+import TagInput from '@/components/tags/tag-input.vue'
+
+export default {
+  props: ['rule', 'ready', 'createMode', 'isEditable', 'hasRuleTemplate', 'inScriptEditor', 'inSceneEditor'],
+  components: {
+    TagInput
+  },
+  computed: {
+    numberOfTags () {
+      if (!this.rule.tags) return 0
+      return this.rule.tags.filter((t) => !this.isScriptTag(t) && !this.isSceneTag(t)).length
+    }
+  },
+  methods: {
+    isScriptTag (tag) {
+      if (this.inScriptEditor !== true) return false
+      if (tag === 'Script') return true
+    },
+    isSceneTag (tag) {
+      if (this.inSceneEditor !== true) return false
+      if (tag === 'Scene') return true
+    }
+  }
+}
+</script>
diff --git a/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue b/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
index b8935e35b9..f43974d7df 100644
--- a/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
+++ b/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
@@ -3,7 +3,7 @@
     <f7-list>
       <f7-list-item>
         <div slot="inner">
-          <f7-chip v-for="tag in item.tags.filter((t) => !isSemanticTag(t) && !isScriptTag(t))" :key="tag" :text="tag" :deleteable="!disabled" @delete="deleteTag" media-bg-color="blue">
+          <f7-chip v-for="tag in item.tags.filter((t) => (showSemanticTags ? true : !isSemanticTag(t)) && !isScriptTag(t) && !isSceneTag(t))" :key="tag" :text="tag" :deleteable="!disabled" @delete="deleteTag" media-bg-color="blue">
             <f7-icon slot="media" ios="f7:tag_fill" md="material:label" aurora="f7:tag_fill" />
           </f7-chip>
         </div>
@@ -29,7 +29,7 @@ import TagMixin from '@/components/tags/tag-mixin'
 
 export default {
   mixins: [TagMixin],
-  props: ['item', 'disabled', 'inScriptEditor'],
+  props: ['item', 'disabled', 'inScriptEditor', 'inSceneEditor', 'showSemanticTags'],
   data () {
     return {
       pendingTag: ''
@@ -40,6 +40,10 @@ export default {
       if (this.inScriptEditor !== true) return false
       if (tag === 'Script') return true
     },
+    isSceneTag (tag) {
+      if (this.inSceneEditor !== true) return false
+      if (tag === 'Scene') return true
+    },
     addTag () {
       if (this.pendingTag && this.item.tags.indexOf(this.pendingTag) === -1) {
         this.item.tags.push(this.pendingTag)
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit-mixin.js b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit-mixin.js
new file mode 100644
index 0000000000..469d34b808
--- /dev/null
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit-mixin.js
@@ -0,0 +1,111 @@
+import YAML from 'yaml'
+
+export default {
+  data () {
+    return {
+      showModuleControls: false,
+      eventSource: null,
+      keyHandler: null
+    }
+  },
+  computed: {
+    isEditable () {
+      return this.rule && this.rule.editable !== false
+    },
+    yamlError () {
+      if (this.currentTab !== 'code') return null
+      try {
+        YAML.parse(this.ruleYaml, { prettyErrors: true })
+        return 'OK'
+      } catch (e) {
+        return e
+      }
+    }
+  },
+  methods: {
+    onPageAfterIn () {
+      if (window) {
+        window.addEventListener('keydown', this.keyDown)
+      }
+      this.load()
+    },
+    onPageAfterOut () {
+      this.stopEventSource()
+      if (window) {
+        window.removeEventListener('keydown', this.keyDown)
+      }
+    },
+    onEditorInput (value) {
+      this.ruleYaml = value
+      this.dirty = true
+    },
+    toggleDisabled () {
+      if (this.createMode) return
+      if (this.copyMode) return
+      const enable = (this.rule.status.statusDetail === 'DISABLED')
+      this.$oh.api.postPlain('/rest/rules/' + this.rule.uid + '/enable', enable.toString()).then((data) => {
+        this.$f7.toast.create({
+          text: (enable) ? 'Enabled' : 'Disabled',
+          destroyOnClose: true,
+          closeTimeout: 2000
+        }).open()
+      }).catch((err) => {
+        this.$f7.toast.create({
+          text: 'Error while disabling or enabling: ' + err,
+          destroyOnClose: true,
+          closeTimeout: 2000
+        }).open()
+      })
+    },
+    keyDown (ev) {
+      if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) {
+        if (this.currentModule) return
+        switch (ev.keyCode) {
+          case 68:
+            this.toggleDisabled()
+            ev.stopPropagation()
+            ev.preventDefault()
+            break
+          case 82:
+            this.runNow()
+            ev.stopPropagation()
+            ev.preventDefault()
+            break
+          case 83:
+            this.save()
+            ev.stopPropagation()
+            ev.preventDefault()
+            break
+        }
+      }
+    },
+    toggleModuleControls () {
+      this.showModuleControls = !this.showModuleControls
+    },
+    showSwipeout (ev) {
+      let swipeoutElement = ev.target
+      ev.cancelBubble = true
+      while (!swipeoutElement.classList.contains('swipeout')) {
+        swipeoutElement = swipeoutElement.parentElement
+      }
+
+      if (swipeoutElement) {
+        this.$f7.swipeout.open(swipeoutElement)
+      }
+    },
+    startEventSource () {
+      this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/' + this.ruleId + '/*', null, (event) => {
+        const topicParts = event.topic.split('/')
+        switch (topicParts[3]) {
+          case 'state':
+            this.$set(this.rule, 'status', JSON.parse(event.payload)) // e.g. {"status":"RUNNING","statusDetail":"NONE"}
+            break
+        }
+      })
+    },
+    stopEventSource () {
+      this.$oh.sse.close(this.eventSource)
+      this.eventSource = null
+    }
+  }
+}
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
index d5c76e581a..ab31ce4901 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
@@ -50,35 +50,9 @@
           </f7-col>
         </f7-block>
 
-        <!-- skeletons -->
-        <f7-block v-if="!ready" class="block-narrow">
-          <f7-col class="skeleton-text skeleton-effect-blink">
-            <f7-list inline-labels no-hairlines-md>
-              <f7-list-input label="Unique ID" type="text" placeholder="Required" value="_______" required validate
-                             :disabled="true" :info="(isNewRule) ? 'Note: cannot be changed after the creation' : ''"
-                             @input="rule.uid = $event.target.value" :clear-button="isNewRule" />
-              <f7-list-input label="Name" type="text" placeholder="Required" required validate
-                             :disabled="true" @input="rule.name = $event.target.value" :clear-button="isEditable" />
-              <f7-list-input label="Description" type="text" value="__ _____ ___ __ ___"
-                             :disabled="true" @input="rule.description = $event.target.value" :clear-button="isEditable" />
-            </f7-list>
-          </f7-col>
-        </f7-block>
-
-        <f7-block v-else class="block-narrow">
-          <f7-col>
-            <f7-list inline-labels no-hairlines-md>
-              <f7-list-input label="Unique ID" type="text" placeholder="Required" :value="rule.uid" required validate
-                             :disabled="!isNewRule" :info="(isNewRule) ? 'Note: cannot be changed after the creation' : ''"
-                             pattern="[A-Za-z0-9_\-]+" error-message="Required. A-Z,a-z,0-9,_,- only"
-                             @input="rule.uid = $event.target.value" :clear-button="isNewRule" />
-              <f7-list-input label="Name" type="text" placeholder="Required" :value="rule.name" required validate
-                             :disabled="!isEditable" @input="rule.name = $event.target.value" :clear-button="isEditable" />
-              <f7-list-input label="Description" type="text" :value="rule.description"
-                             :disabled="!isEditable" @input="rule.description = $event.target.value" :clear-button="isEditable" />
-            </f7-list>
-          </f7-col>
+        <rule-general-settings :rule="rule" :ready="ready" :createMode="isNewRule" :isEditable="isEditable" :hasTemplate="hasTemplate" />
 
+        <f7-block v-if="ready" class="block-narrow">
           <f7-block-footer v-if="!isEditable" class="no-margin padding-left">
             <f7-icon f7="lock_fill" size="12" color="gray" />&nbsp;Note: this rule is not editable because it has been provisioned from a file.
           </f7-block-footer>
@@ -150,11 +124,6 @@
               </f7-list>
             </div>
           </f7-col>
-          <f7-col v-if="(isEditable || rule.tags.length > 0) && !hasTemplate">
-            <f7-block-title>Tags</f7-block-title>
-            <semantics-picker v-if="isEditable" :item="rule" />
-            <tag-input :item="rule" :disabled="!isEditable" />
-          </f7-col>
           <f7-col v-if="isEditable && (!isNewRule)">
             <f7-list>
               <f7-list-button color="blue" @click="copyRule">
@@ -211,23 +180,21 @@ import YAML from 'yaml'
 import cloneDeep from 'lodash/cloneDeep'
 import fastDeepEqual from 'fast-deep-equal/es6'
 
-import SemanticsPicker from '@/components/tags/semantics-picker.vue'
-import TagInput from '@/components/tags/tag-input.vue'
-
 import RuleModulePopup from './rule-module-popup.vue'
 
+import RuleMixin from './rule-edit-mixin'
 import ModuleDescriptionSuggestions from './module-description-suggestions'
 import RuleStatus from '@/components/rule/rule-status-mixin'
 import DirtyMixin from '../dirty-mixin'
 
 import ConfigSheet from '@/components/config/config-sheet.vue'
+import RuleGeneralSettings from '@/components/rule/rule-general-settings.vue'
 
 export default {
-  mixins: [ModuleDescriptionSuggestions, RuleStatus, DirtyMixin],
+  mixins: [RuleMixin, ModuleDescriptionSuggestions, RuleStatus, DirtyMixin],
   components: {
+    RuleGeneralSettings,
     ConfigSheet,
-    SemanticsPicker,
-    TagInput,
     'editor': () => import(/* webpackChunkName: "script-editor" */ '@/components/config/controls/script-editor.vue')
   },
   props: ['ruleId', 'createMode', 'copyMode', 'ruleCopy', 'schedule'],
@@ -242,7 +209,6 @@ export default {
         conditions: [],
         triggers: []
       },
-      showModuleControls: false,
       currentSection: 'actions',
       currentTab: 'design',
       currentModuleType: null,
@@ -253,8 +219,6 @@ export default {
         actions: ['Then', 'Add Action'],
         conditions: ['But only if', 'Add Condition']
       },
-      eventSource: null,
-      keyHandler: null,
 
       codeEditorOpened: false,
       cronPopupOpened: false,
@@ -281,22 +245,6 @@ export default {
     }
   },
   methods: {
-    onPageAfterIn () {
-      if (window) {
-        window.addEventListener('keydown', this.keyDown)
-      }
-      this.load()
-    },
-    onPageAfterOut () {
-      this.stopEventSource()
-      if (window) {
-        window.removeEventListener('keydown', this.keyDown)
-      }
-    },
-    onEditorInput (value) {
-      this.ruleYaml = value
-      this.dirty = true
-    },
     load () {
       if (this.loading) return
       this.loading = true
@@ -412,23 +360,6 @@ export default {
         }).open()
       })
     },
-    toggleDisabled () {
-      if (this.isNewRule) return
-      const enable = (this.rule.status.statusDetail === 'DISABLED')
-      this.$oh.api.postPlain('/rest/rules/' + this.rule.uid + '/enable', enable.toString()).then((data) => {
-        this.$f7.toast.create({
-          text: (enable) ? 'Rule enabled' : 'Rule disabled',
-          destroyOnClose: true,
-          closeTimeout: 2000
-        }).open()
-      }).catch((err) => {
-        this.$f7.toast.create({
-          text: 'Error while disabling or enabling: ' + err,
-          destroyOnClose: true,
-          closeTimeout: 2000
-        }).open()
-      })
-    },
     copyRule () {
       let ruleClone = cloneDeep(this.rule)
       this.$f7router.navigate({
@@ -477,20 +408,6 @@ export default {
         }
       )
     },
-    startEventSource () {
-      this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/' + this.ruleId + '/*', null, (event) => {
-        const topicParts = event.topic.split('/')
-        switch (topicParts[3]) {
-          case 'state':
-            this.$set(this.rule, 'status', JSON.parse(event.payload))
-            break
-        }
-      })
-    },
-    stopEventSource () {
-      this.$oh.sse.close(this.eventSource)
-      this.eventSource = null
-    },
     selectTemplate (uid) {
       this.$set(this.rule, 'configuration', {})
       this.$set(this.rule, 'triggers', [])
@@ -503,42 +420,6 @@ export default {
       this.$set(this, 'currentTemplate', this.templates.find((t) => t.uid === uid))
       this.rule.templateUID = uid
     },
-    keyDown (ev) {
-      if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) {
-        if (this.currentModule) return
-        switch (ev.keyCode) {
-          case 68:
-            this.toggleDisabled()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-          case 82:
-            this.runNow()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-          case 83:
-            this.save()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-        }
-      }
-    },
-    toggleModuleControls () {
-      this.showModuleControls = !this.showModuleControls
-    },
-    showSwipeout (ev) {
-      let swipeoutElement = ev.target
-      ev.cancelBubble = true
-      while (!swipeoutElement.classList.contains('swipeout')) {
-        swipeoutElement = swipeoutElement.parentElement
-      }
-
-      if (swipeoutElement) {
-        this.$f7.swipeout.open(swipeoutElement)
-      }
-    },
     editModule (ev, section, mod, force) {
       if (this.showModuleControls) return
       if (!this.isEditable) return
@@ -740,9 +621,6 @@ export default {
     }
   },
   computed: {
-    isEditable () {
-      return this.rule && this.rule.editable !== false
-    },
     hasTemplate () {
       return this.rule && this.currentTemplate !== null
     },
@@ -755,15 +633,6 @@ export default {
       const marketplaceTag = this.currentTemplate.tags.find((t) => t.indexOf('marketplace:') === 0)
       if (marketplaceTag) return 'https://community.openhab.org/t/' + marketplaceTag.replace('marketplace:', '')
       return null
-    },
-    yamlError () {
-      if (this.currentTab !== 'code') return null
-      try {
-        YAML.parse(this.ruleYaml, { prettyErrors: true })
-        return 'OK'
-      } catch (e) {
-        return e
-      }
     }
   }
 }
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
index a2294280f7..3e81b11772 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
@@ -23,7 +23,7 @@
             <div class="float-right align-items-flex-start align-items-center">
               <!-- <f7-toggle class="enable-toggle"></f7-toggle> -->
               <f7-link :icon-color="(rule.status.statusDetail === 'DISABLED') ? 'orange' : 'gray'" :tooltip="((rule.status.statusDetail === 'DISABLED') ? 'Enable' : 'Disable') + (($device.desktop) ? ' (Ctrl-D)' : '')" icon-ios="f7:pause_circle" icon-md="f7:pause_circle" icon-aurora="f7:pause_circle" icon-size="32" color="orange" @click="toggleDisabled" />
-              <f7-link :tooltip="'Run Now' + (($device.desktop) ? ' (Ctrl-R)' : '')" icon-ios="f7:play_round" icon-md="f7:play_round" icon-aurora="f7:play_round" icon-size="32" color="blue" @click="runNow" />
+              <f7-link :tooltip="'Activate Now' + (($device.desktop) ? ' (Ctrl-R)' : '')" icon-ios="f7:play_round" icon-md="f7:play_round" icon-aurora="f7:play_round" icon-size="32" color="blue" @click="runNow" />
             </div>
             Status:
             <f7-chip class="margin-left"
@@ -50,37 +50,9 @@
           </f7-col>
         </f7-block>
 
-        <!-- skeletons -->
-        <f7-block v-if="!ready" class="block-narrow">
-          <f7-col class="skeleton-text skeleton-effect-blink">
-            <f7-list inline-labels no-hairlines-md>
-              <f7-list-input label="Unique ID" type="text" placeholder="Required" value="_______" required validate
-                             :disabled="true" :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
-                             @input="rule.uid = $event.target.value" :clear-button="createMode" />
-              <f7-list-input label="Name" type="text" placeholder="Required" required validate
-                             :disabled="true" @input="rule.name = $event.target.value" :clear-button="isEditable" />
-              <f7-list-input label="Description" type="text" value="__ _____ ___ __ ___"
-                             :disabled="true" @input="rule.description = $event.target.value" :clear-button="isEditable" />
-            </f7-list>
-          </f7-col>
-        </f7-block>
-
-        <f7-block v-else class="block-narrow">
-          <f7-col>
-            <f7-list inline-labels no-hairlines-md>
-              <f7-list-input label="Unique ID" type="text" placeholder="Required" :value="rule.uid" required validate
-                             :disabled="!createMode"
-                             :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
-                             pattern="[A-Za-z0-9_\-]+" error-message="Required. A-Z,a-z,0-9,_,- only"
-                             @input="rule.uid = $event.target.value" :clear-button="createMode" />
-              <f7-list-input label="Name" type="text" placeholder="Required" :value="rule.name" required validate
-                             :disabled="!isEditable" @input="rule.name = $event.target.value" :clear-button="isEditable" />
-              <f7-list-input label="Description" type="text" :value="rule.description"
-                             :disabled="!isEditable" @input="rule.description = $event.target.value"
-                             :clear-button="isEditable" />
-            </f7-list>
-          </f7-col>
+        <rule-general-settings :rule="rule" :ready="ready" :createMode="createMode" :isEditable="isEditable" :isSceneEditor="true" />
 
+        <f7-block v-if="ready" class="block-narrow">
           <f7-block-footer v-if="!isEditable" class="no-margin padding-left">
             <f7-icon f7="lock_fill" size="12" color="gray" />&nbsp;Note: this rule is not editable because it has been
             provisioned from a file.
@@ -141,11 +113,6 @@
               </f7-list>
             </div>
           </f7-col>
-          <f7-col v-if="(isEditable || rule.tags.length > 0)">
-            <f7-block-title>Tags</f7-block-title>
-            <semantics-picker v-if="isEditable" :item="rule" />
-            <tag-input :item="rule" :disabled="!isEditable" />
-          </f7-col>
           <f7-col v-if="isEditable && !createMode">
             <f7-list>
               <f7-list-button color="red" @click="deleteRule">
@@ -221,22 +188,21 @@
 <script>
 import YAML from 'yaml'
 import cloneDeep from 'lodash/cloneDeep'
-
-import SemanticsPicker from '@/components/tags/semantics-picker.vue'
-import ItemPicker from '@/components/config/controls/item-picker.vue'
-import TagInput from '@/components/tags/tag-input.vue'
+import fastDeepEqual from 'fast-deep-equal/es6'
 
 import SceneConfigureItemPopup from './scene-configure-item-popup.vue'
 
+import RuleMixin from '../rule-edit-mixin'
 import RuleStatus from '@/components/rule/rule-status-mixin'
 import DirtyMixin from '../../dirty-mixin'
-import fastDeepEqual from 'fast-deep-equal/es6'
+
+import ItemPicker from '@/components/config/controls/item-picker.vue'
+import RuleGeneralSettings from '@/components/rule/rule-general-settings.vue'
 
 export default {
-  mixins: [RuleStatus, DirtyMixin],
+  mixins: [RuleMixin, RuleStatus, DirtyMixin],
   components: {
-    SemanticsPicker,
-    TagInput,
+    RuleGeneralSettings,
     ItemPicker,
     'editor': () => import(/* webpackChunkName: "script-editor" */ '@/components/config/controls/script-editor.vue')
   },
@@ -245,7 +211,6 @@ export default {
     return {
       ready: false,
       loading: false,
-      eventSource: null,
       rule: {},
       ruleYaml: '',
       moduleTypes: {
@@ -253,12 +218,10 @@ export default {
         conditions: [],
         triggers: []
       },
-      showModuleControls: false,
       currentTab: 'design',
       currentModuleType: null,
       currentModule: null,
       currentModuleConfig: {},
-      keyHandler: null,
       selectedItems: [],
 
       codeEditorOpened: false
@@ -281,22 +244,6 @@ export default {
     }
   },
   methods: {
-    onPageAfterIn () {
-      if (window) {
-        window.addEventListener('keydown', this.keyDown)
-      }
-      this.load()
-    },
-    onPageAfterOut () {
-      this.stopEventSource()
-      if (window) {
-        window.removeEventListener('keydown', this.keyDown)
-      }
-    },
-    onEditorInput (value) {
-      this.ruleYaml = value
-      this.dirty = true
-    },
     load () {
       if (this.loading) return
       this.loading = true
@@ -393,23 +340,6 @@ export default {
         }).open()
       })
     },
-    toggleDisabled () {
-      if (this.createMode) return
-      const enable = (this.rule.status.statusDetail === 'DISABLED')
-      this.$oh.api.postPlain('/rest/rules/' + this.rule.uid + '/enable', enable.toString()).then((data) => {
-        this.$f7.toast.create({
-          text: (enable) ? 'Scene enabled' : 'Scene disabled',
-          destroyOnClose: true,
-          closeTimeout: 2000
-        }).open()
-      }).catch((err) => {
-        this.$f7.toast.create({
-          text: 'Error while disabling or enabling: ' + err,
-          destroyOnClose: true,
-          closeTimeout: 2000
-        }).open()
-      })
-    },
     runNow () {
       if (this.createMode) return
       if (this.rule.status.status === 'RUNNING' || this.rule.status.status === 'UNINITIALIZED') {
@@ -443,61 +373,11 @@ export default {
         'Delete Scene',
         () => {
           this.$oh.api.delete('/rest/rules/' + this.rule.uid).then(() => {
-            this.$f7router.back('/settings/rules/', { force: true })
+            this.$f7router.back('/settings/scenes/', { force: true })
           })
         }
       )
     },
-    startEventSource () {
-      this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/' + this.ruleId + '/*', null, (event) => {
-        const topicParts = event.topic.split('/')
-        switch (topicParts[3]) {
-          case 'state':
-            this.$set(this.rule, 'status', JSON.parse(event.payload)) // e.g. {"status":"RUNNING","statusDetail":"NONE"}
-            break
-        }
-      })
-    },
-    stopEventSource () {
-      this.$oh.sse.close(this.eventSource)
-      this.eventSource = null
-    },
-    keyDown (ev) {
-      if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) {
-        if (this.currentModule) return
-        switch (ev.keyCode) {
-          case 68:
-            this.toggleDisabled()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-          case 82:
-            this.runNow()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-          case 83:
-            this.save()
-            ev.stopPropagation()
-            ev.preventDefault()
-            break
-        }
-      }
-    },
-    toggleModuleControls () {
-      this.showModuleControls = !this.showModuleControls
-    },
-    showSwipeout (ev) {
-      let swipeoutElement = ev.target
-      ev.cancelBubble = true
-      while (!swipeoutElement.classList.contains('swipeout')) {
-        swipeoutElement = swipeoutElement.parentElement
-      }
-
-      if (swipeoutElement) {
-        this.$f7.swipeout.open(swipeoutElement)
-      }
-    },
     editModule (ev, mod) {
       if (ev.target.tagName.toLowerCase() === 'input') {
         ev.cancelBubble = true
@@ -655,20 +535,6 @@ export default {
         return false
       }
     }
-  },
-  computed: {
-    isEditable () {
-      return this.rule && this.rule.editable !== false
-    },
-    yamlError () {
-      if (this.currentTab !== 'code') return null
-      try {
-        YAML.parse(this.ruleYaml, { prettyErrors: true })
-        return 'OK'
-      } catch (e) {
-        return e
-      }
-    }
   }
 }
 </script>
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
index 2bf26f4b04..8b5cd9a59a 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
@@ -1,41 +1,28 @@
 <template>
-  <f7-block v-if="!ready" class="block-narrow">
-    <f7-col v-if="createMode || isScriptRule">
-      <f7-list class="no-margin" inline-labels no-hairlines-md>
-        <f7-list-input label="Unique ID" type="text" placeholder="Required" :value="rule.uid" required validate
-                       :disabled="!createMode" :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
-                       pattern="[A-Za-z0-9_\-]+" error-message="Required. A-Z,a-z,0-9,_,- only"
-                       @input="rule.uid = $event.target.value" :clear-button="createMode" />
-        <f7-list-input label="Name" type="text" placeholder="Required" :value="rule.name" required validate
-                       @input="rule.name = $event.target.value" clear-button />
-        <f7-list-input label="Description" type="text" :value="rule.description"
-                       @input="rule.description = $event.target.value" clear-button />
-      </f7-list>
-    </f7-col>
-    <f7-col v-if="createMode || isScriptRule">
-      <f7-block-title>Tags</f7-block-title>
-      <tag-input :item="rule" :disabled="false" :inScriptEditor="true" />
-    </f7-col>
-    <f7-col v-if="!createMode && languages">
-      <f7-block-title>Scripting Language</f7-block-title>
-      <f7-list media-list>
-        <f7-list-item media-item radio radio-icon="start"
-                      :value="mode" :checked="mode === language.contentType" @change="$emit('newLanguage', language.contentType)"
-                      v-for="language in languages" :key="language.contentType"
-                      :title="language.name" :after="language.version" :footer="language.contentType" />
-      </f7-list>
-    </f7-col>
-  </f7-block>
+  <div>
+    <rule-general-settings v-if="createMode || isScriptRule" :ready="true" :rule="rule" :createMode="createMode" :isEditable="true" :inScriptEditor="true" />
+    <f7-block class="block-narrow">
+      <f7-col v-if="!createMode && languages">
+        <f7-block-title>Scripting Language</f7-block-title>
+        <f7-list media-list>
+          <f7-list-item media-item radio radio-icon="start"
+                        :value="mode" :checked="mode === language.contentType" @change="$emit('newLanguage', language.contentType)"
+                        v-for="language in languages" :key="language.contentType"
+                        :title="language.name" :after="language.version" :footer="language.contentType" />
+        </f7-list>
+      </f7-col>
+    </f7-block>
+  </div>
 </template>
 
 <script>
-import TagInput from '@/components/tags/tag-input.vue'
+import RuleGeneralSettings from '@/components/rule/rule-general-settings.vue'
 
 export default {
-  props: ['rule', 'createMode', 'ready', 'isScriptRule', 'languages', 'mode'],
+  props: ['rule', 'createMode', 'isScriptRule', 'languages', 'mode'],
   emits: ['newLanguage'],
   components: {
-    TagInput
+    RuleGeneralSettings
   }
 }
 </script>