diff --git a/package.json b/package.json
index 9c66073e5fb..bbf8c4d0366 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
     "get-object-path": "azer/get-object-path#74eb42de0cfd02c14ffdd18552f295aba723d394",
     "hadron-action": "^0.1.0",
-    "hadron-app-registry": "^3.3.0",
+    "hadron-app-registry": "^3.4.0",
     "hadron-auto-update-manager": "^0.0.12",
     "hadron-compile-cache": "^0.3.0",
     "hadron-document": "^0.29.0",
diff --git a/src/internal-packages/crud/lib/component/document.jsx b/src/internal-packages/crud/lib/component/document.jsx
index da4cbaff8f5..671c6ebe0d4 100644
--- a/src/internal-packages/crud/lib/component/document.jsx
+++ b/src/internal-packages/crud/lib/component/document.jsx
@@ -83,7 +83,7 @@ class Document extends React.Component {
           this.ns,
           { _id: object._id },
           object,
-          { returnOriginal: false },
+          { returnOriginal: false, promoteValues: false },
           this.handleResult
         );
       },
diff --git a/src/internal-packages/crud/lib/store/load-more-documents-store.js b/src/internal-packages/crud/lib/store/load-more-documents-store.js
index 82b5338be18..924141cdfeb 100644
--- a/src/internal-packages/crud/lib/store/load-more-documents-store.js
+++ b/src/internal-packages/crud/lib/store/load-more-documents-store.js
@@ -28,7 +28,13 @@ const LoadMoreDocumentsStore = Reflux.createStore({
    */
   loadMoreDocuments: function(skip) {
     const filter = app.queryOptions.query;
-    const options = { skip: skip, limit: 20, sort: [[ '_id', 1 ]], readPreference: READ };
+    const options = {
+      skip: skip,
+      limit: 20,
+      sort: [[ '_id', 1 ]],
+      readPreference: READ,
+      promoteValues: false
+    };
     app.dataService.find(NamespaceStore.ns, filter, options, (error, documents) => {
       if (!error) {
         this.trigger(documents);
diff --git a/src/internal-packages/crud/lib/store/reset-document-list-store.js b/src/internal-packages/crud/lib/store/reset-document-list-store.js
index 0503defc43a..d6871175cee 100644
--- a/src/internal-packages/crud/lib/store/reset-document-list-store.js
+++ b/src/internal-packages/crud/lib/store/reset-document-list-store.js
@@ -53,7 +53,12 @@ const ResetDocumentListStore = Reflux.createStore({
     if (NamespaceStore.ns) {
       app.dataService.count(NamespaceStore.ns, filter, OPTIONS, (err, count) => {
         if (!err) {
-          const options = { limit: 20, sort: [[ '_id', 1 ]], readPreference: READ };
+          const options = {
+            limit: 20,
+            sort: [[ '_id', 1 ]],
+            readPreference: READ,
+            promoteValues: false
+          };
           app.dataService.find(NamespaceStore.ns, filter, options, (error, documents) => {
             if (!error) {
               this.trigger(documents, count);
diff --git a/src/internal-packages/crud/styles/editable-element-value.less b/src/internal-packages/crud/styles/editable-element-value.less
index dce1b2b4a47..eb7ad719580 100644
--- a/src/internal-packages/crud/styles/editable-element-value.less
+++ b/src/internal-packages/crud/styles/editable-element-value.less
@@ -16,8 +16,20 @@
     }
   }
 
-  &-is-int32, &-is-int64, &-is-double, &-is-decimal128 {
-    color: green;
+  &-is-int32 {
+    color: #145a32;
+  }
+
+  &-is-int64 {
+    color: #196f3d;
+  }
+
+  &-is-double {
+    color: #1e8449;
+  }
+
+  &-is-decimal128 {
+    color: #229954;
   }
 
   &-is-date {
diff --git a/src/internal-packages/crud/styles/element.less b/src/internal-packages/crud/styles/element.less
index 0835cef5e24..9f7cfd6f62f 100644
--- a/src/internal-packages/crud/styles/element.less
+++ b/src/internal-packages/crud/styles/element.less
@@ -32,8 +32,20 @@
       }
     }
 
-    &-is-int32, &-is-int64, &-is-double, &-is-decimal128 {
-      color: green;
+    &-is-int32 {
+      color: #145a32;
+    }
+
+    &-is-int64 {
+      color: #196f3d;
+    }
+
+    &-is-double {
+      color: #1e8449;
+    }
+
+    &-is-decimal128 {
+      color: #229954;
     }
 
     &-is-date {