diff --git a/entity/Activity_entity/entityfields/icon/valueProcess.js b/entity/Activity_entity/entityfields/icon/valueProcess.js
index 6cb990d62b05f123426dfa2e60d2b377aa4afa62..505a2c92f1097e44b662beacd05f9f43dd4b4b50 100644
--- a/entity/Activity_entity/entityfields/icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/icon/valueProcess.js
@@ -4,7 +4,7 @@ import("system.neon");
 import("Keyword_lib");
 
 var category = vars.getString("$field.CATEGORY");
-var kwd = LegacyKeywordUtils.createKeyword("ACTIVITY.CATEGORY");
+var kwd = LegacyKeywordUtils.createKeyword("ACTIVITY.CATEGORY");//getPropForKey
 var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
 
 result.string(icon || "NEON:HISTORY");
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index 7cecd3b427054a5a7558dcc24adaf976c33bc034..c30d6b2520c493830ac572123194912dd8ef0d1b 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,6 +1,7 @@
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
 var histMedium = vars.get("$field.CATEGORY");
-result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")" : ""));
+result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), histMedium) + ")" : ""));
diff --git a/entity/Communication_entity/entityfields/medium_id/valueMappingProcess.js b/entity/Communication_entity/entityfields/medium_id/valueMappingProcess.js
deleted file mode 100644
index a567223ae010bfe6382ee6e14fa7449fc4e1d670..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/entityfields/medium_id/valueMappingProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var kwdUtils, items;
-
-items = LegacyKeywordUtils.getStandardArray("COMMUNICATION.MEDIUM");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/image/valueProcess.js b/entity/Salesproject_entity/entityfields/image/valueProcess.js
index 90f0619c9f05b2c4862a7b0c93e15648467ac16f..c04626b8e075d07b742f63f4810cde51d710516e 100644
--- a/entity/Salesproject_entity/entityfields/image/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-result.string("TEXT:" + LegacyKeywordUtils.getViewValue("SALESPROJECT.STATE", vars.getString("$field.STATE")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.getString("$field.STATE")) );
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index fac87a5a41c758ad886812fb8ad124640a534e9d..6cf2ac0f1641836470f3adc8b34c6306761ba91d 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -138,7 +138,7 @@ OfferUtils.openOfferReport = function(pOfferID)
     var rptdata = db.table(offerCondition.buildSql("select " + fields.join(", ") + offerFromSql, "1 = 0"));
     
     //TODO: use new keyword logic for language when possible
-    var language = "DE"; // LegacyKeywordUtils.get("LANGUAGE", rptdata[0][2])[1];
+    var language = "DE";
     var relid = rptdata[0][1];
     
     // TODO: AddrObject implementieren
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 4eb2065194eef9d9bdbc4db00a7faf6561db38cb..27589bda8a5c0746e093e9fcc99fe8f719010339 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -76,7 +76,7 @@ OrgUtils.openOrgReport = function(pOrgId)
     //resolve keyword
     commData.forEach(function (row)
     {
-        row[0] = LegacyKeywordUtils.getViewValue("COMMUNICATION.MEDIUM", row[0]);
+        row[0] = KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), row[0]);
     });
     commData = ReportData.begin(["KINDOFCOMM", "COMMVALUE"]).add(commData);
     
@@ -114,7 +114,7 @@ OrgUtils.openOrgReport = function(pOrgId)
         //resolve keyword
         persData[i][3] = persDataComm.map(function (row)
             {
-                return LegacyKeywordUtils.getViewValue("COMMUNICATION.MEDIUM", row[0]) + ": " + row[1];
+                return KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), row[0]) + ": " + row[1];
             }
         ).join("\n");
     }
@@ -133,7 +133,7 @@ OrgUtils.openOrgReport = function(pOrgId)
     histData.forEach(function (row) 
     {
         row[0] = datetime.toDate(row[0], dateFormat);
-        row[1] = LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", row[1]);
+        row[1] = LegacyKeywordUtils.getViewValue($KeywordRegistry.activityCategory(), row[1]);
         _joinArrayVals(row, 2, 2);
     });
     histData = ReportData.begin(["ENTRYDATE", "MEDIUM", "LOGIN", "INFO"]).add(histData);