diff --git a/src/icingadb-web/messages.pot b/src/icingadb-web/messages.pot
index 1d9a1a22..720e0e8f 100644
--- a/src/icingadb-web/messages.pot
+++ b/src/icingadb-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-audit/messages.pot b/src/icingaweb2-module-audit/messages.pot
index 1bfb53d7..c41d4dd5 100644
--- a/src/icingaweb2-module-audit/messages.pot
+++ b/src/icingaweb2-module-audit/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-aws/messages.pot b/src/icingaweb2-module-aws/messages.pot
index 12730e80..44e7b89b 100644
--- a/src/icingaweb2-module-aws/messages.pot
+++ b/src/icingaweb2-module-aws/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-businessprocess/messages.pot b/src/icingaweb2-module-businessprocess/messages.pot
index c4d5651c..5f5d4399 100644
--- a/src/icingaweb2-module-businessprocess/messages.pot
+++ b/src/icingaweb2-module-businessprocess/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -723,60 +723,60 @@ msgstr ""
 msgid "Show Overview"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:138
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:141
 msgctxt "businessprocess.nodes"
 msgid "Child"
 msgid_plural "Children"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:215
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:218
 msgid "Show tiles for this subtree"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:222
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:225
 msgid "Show this subtree as a tree"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:235
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:215
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:238
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:222
 msgid "Show this process as part of its original configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:251
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:323
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:254
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:330
 msgid "More information"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:305
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:308
 msgid "Show the business impact of this node by simulating a specific state"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:317
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:320
 msgid "Modify this monitored node"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:334
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:337
 msgid "Modify this business process node"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:348
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:351
 msgid "Add a new sub-node to this business process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:365
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TileRenderer/NodeTile.php:368
 msgid "Delete this node"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:300
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:307
 msgid "Modify this node"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:313
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:320
 msgid "Simulate a specific state"
 msgstr ""
 
-#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:347
+#: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Renderer/TreeRenderer.php:354
 #: sources.d/icingaweb2-module-businessprocess/library/Businessprocess/Web/Component/RenderedProcessActionBar.php:128
 msgid "Add a new business process node"
 msgstr ""
diff --git a/src/icingaweb2-module-cube/messages.pot b/src/icingaweb2-module-cube/messages.pot
index 908fbd17..bd56a64c 100644
--- a/src/icingaweb2-module-cube/messages.pot
+++ b/src/icingaweb2-module-cube/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,26 +21,26 @@ msgstr ""
 msgid "+ Add a dimension"
 msgstr ""
 
-#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:70
+#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:71
 msgid "Slice/Filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:101
+#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:102
 #, php-format
 msgid "Remove dimension \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:107
+#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:108
 #, php-format
 msgid "Move dimension \"%s\" up"
 msgstr ""
 
-#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:113
+#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:114
 #, php-format
 msgid "Move dimension \"%s\" down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:206
+#: sources.d/icingaweb2-module-cube/application/forms/DimensionsForm.php:207
 msgid "New dimension has been added"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/messages.pot b/src/icingaweb2-module-director/messages.pot
index 29ee7250..5bef9373 100644
--- a/src/icingaweb2-module-director/messages.pot
+++ b/src/icingaweb2-module-director/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,7 +51,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89
 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:563
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:372
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:404
 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129
 msgid "Add to Basket"
 msgstr ""
@@ -64,15 +64,15 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:115
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:355
 #: sources.d/icingaweb2-module-director/application/controllers/DataController.php:138
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:542
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:546
 #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:365
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:149
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:209
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:155
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:215
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:522
 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35
 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:233
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:593
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:265
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:625
 msgid "back"
 msgstr ""
 
@@ -186,34 +186,34 @@ msgid ""
 "Director instance."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:30
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:37
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/SyncRunDetails.php:27
 msgid "Activity"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:31
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:38
 msgid "Branch Activity"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:41
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:48
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:31
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/ActivityLogInfo.php:501
 msgid "Author"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:42
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:49
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/ActivityLogInfo.php:502
 msgid "Date"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:43
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:50
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ConfigFileDiffTable.php:81
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/ActivityLogInfo.php:509
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/ActivityLogInfo.php:520
 msgid "Action"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:93
+#: sources.d/icingaweb2-module-director/application/controllers/BranchController.php:100
 msgid "Modification"
 msgstr ""
 
@@ -316,19 +316,19 @@ msgid "Diff"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:673
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:705
 #, php-format
 msgid "The following modifications are visible in this %s only..."
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:677
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:709
 #: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24
 msgid "configuration branch"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:685
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:717
 msgid "...and the modifications below are already in the main branch:"
 msgstr ""
 
@@ -533,80 +533,85 @@ msgstr ""
 msgid "Add Service Set to %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:137
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:122
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:135
+msgid "Creating Service Sets"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:141
 #: sources.d/icingaweb2-module-director/application/controllers/ServicesetController.php:69
 msgid "Add service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:142
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:146
 msgid "Add service set"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:165
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:169
 #, php-format
 msgid "No such service: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:204
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:208
 #, php-format
 msgid "Services: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:208
-msgid ""
-"Managing services on new Hosts is possible only after they have been merged."
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:214
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:291
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:213
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:292
 msgid "Individual Service objects"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:248
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:323
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:233
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:249
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:324
 #, php-format
 msgid "%s (Applied Service set)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:259
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:338
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:260
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:339
 msgid "Applied services"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:282
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:283
 msgid "Configuration (read-only)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:283
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:284
 #, php-format
 msgid "Services on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:373
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:377
 #, php-format
 msgid "%s (Service set)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:405
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:409
 #, php-format
 msgid "Applied service: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:448
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:452
 #, php-format
 msgid "Inherited service: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:521
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:525
 #, php-format
 msgid "%s on %s (from set: %s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:575
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:579
 msgid "Show"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:599
+#: sources.d/icingaweb2-module-director/application/controllers/HostController.php:603
 #: sources.d/icingaweb2-module-director/library/Director/ProvidedHook/Monitoring/HostActions.php:36
 #: sources.d/icingaweb2-module-director/library/Director/ProvidedHook/Monitoring/ServiceActions.php:43
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:132
@@ -680,7 +685,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:147
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:446
 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:336
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:34
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:34
 msgid "Clone"
@@ -900,27 +905,32 @@ msgid ""
 "where you can register new hosts"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:114
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:117
 #, php-format
 msgid "Add a service to \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:119
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:122
 #, php-format
 msgid "Apply \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:180
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:146
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:164
+msgid "Modifying Templates"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:186
 #, php-format
 msgid "(on %s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:217
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:223
 #, php-format
 msgid "Apply: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:266
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:272
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
@@ -931,8 +941,8 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:270
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:291
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:276
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:297
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:101
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:90
@@ -947,7 +957,7 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:287
+#: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:293
 msgid "ServiceSet"
 msgstr ""
 
@@ -980,24 +990,24 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:252
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:261
 #: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaHost.php:161
-#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:759
+#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:763
 msgid "Host properties"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:253
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:263
 #: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaHost.php:162
-#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:747
+#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:751
 msgid "Custom variables"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:260
-#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:746
+#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:750
 msgid "Service properties"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SuggestController.php:262
-#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:760
+#: sources.d/icingaweb2-module-director/library/Director/Objects/IcingaService.php:764
 msgid "Host Custom variables"
 msgstr ""
 
@@ -1723,7 +1733,7 @@ msgstr ""
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:172
+#: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:176
 #, php-format
 msgid "The service \"%s\" has been added to %d hosts"
 msgstr ""
@@ -3923,7 +3933,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:570
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:602
 msgid "Merge"
 msgstr ""
 
@@ -5783,6 +5793,7 @@ msgid "Create a new object"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:143
 msgid "Create a new Template"
 msgstr ""
 
@@ -5802,53 +5813,77 @@ msgstr ""
 msgid "Switch to Table view"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:92
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:93
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:193
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:137
+msgid "Create a new Service Set"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:142
+msgid "Creating Templates"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:167
+msgid "Modifying Apply Rules"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:201
 #, php-format
 msgid "Clone: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:209
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:204
+msgid "Cloning Templates"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:208
+msgid "Cloning Apply Rules"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:237
 #, php-format
 msgid "Custom fields: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:259
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:241
+msgid "Managing Fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:291
 #, php-format
 msgid "Activity Log: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:284
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:316
 #, php-format
 msgid "Group membership: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:303
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:335
 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116
 #, php-format
 msgid "Template: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:322
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:354
 msgid "Usage"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:390
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:422
 #, php-format
 msgid "Add new Icinga %s template"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:401
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:433
 #, php-format
 msgid "Add %s: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:407
+#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:439
 #, php-format
 msgid "Add new Icinga %s"
 msgstr ""
@@ -6670,11 +6705,11 @@ msgstr ""
 msgid "This template is not in use"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplatesTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplatesTable.php:52
 msgid "Template Name"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplatesTable.php:63
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplatesTable.php:64
 msgid " - not in use -"
 msgstr ""
 
diff --git a/src/icingaweb2-module-elasticsearch/messages.pot b/src/icingaweb2-module-elasticsearch/messages.pot
index 6d4478f5..d4fb3c59 100644
--- a/src/icingaweb2-module-elasticsearch/messages.pot
+++ b/src/icingaweb2-module-elasticsearch/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-graphite/messages.pot b/src/icingaweb2-module-graphite/messages.pot
index 685388a5..cc573226 100644
--- a/src/icingaweb2-module-graphite/messages.pot
+++ b/src/icingaweb2-module-graphite/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-jira/messages.pot b/src/icingaweb2-module-jira/messages.pot
index 829bbb42..753263a1 100644
--- a/src/icingaweb2-module-jira/messages.pot
+++ b/src/icingaweb2-module-jira/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-pdfexport/messages.pot b/src/icingaweb2-module-pdfexport/messages.pot
index 908d27be..9a8de813 100644
--- a/src/icingaweb2-module-pdfexport/messages.pot
+++ b/src/icingaweb2-module-pdfexport/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-reporting/messages.pot b/src/icingaweb2-module-reporting/messages.pot
index e8296de0..3600e38b 100644
--- a/src/icingaweb2-module-reporting/messages.pot
+++ b/src/icingaweb2-module-reporting/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-vspheredb/messages.pot b/src/icingaweb2-module-vspheredb/messages.pot
index 3be35fd3..c67d2d6b 100644
--- a/src/icingaweb2-module-vspheredb/messages.pot
+++ b/src/icingaweb2-module-vspheredb/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-x509/messages.pot b/src/icingaweb2-module-x509/messages.pot
index 742c67a6..212158a0 100644
--- a/src/icingaweb2-module-x509/messages.pot
+++ b/src/icingaweb2-module-x509/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2/messages.pot b/src/icingaweb2/messages.pot
index 8357c929..49274130 100644
--- a/src/icingaweb2/messages.pot
+++ b/src/icingaweb2/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-validator/messages.pot b/src/ipl-validator/messages.pot
index c94ab3cd..f2ae2a14 100644
--- a/src/ipl-validator/messages.pot
+++ b/src/ipl-validator/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-web/messages.pot b/src/ipl-web/messages.pot
index cb935637..a762cc73 100644
--- a/src/ipl-web/messages.pot
+++ b/src/ipl-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n v1.1.0-52-g8264940\n"
+"Project-Id-Version: Icinga L10n 8b87730\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-14 10:34+0100\n"
+"POT-Creation-Date: 2021-12-17 16:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"