diff --git a/analyzers/CyberChef/CyberChefFromBase64.json b/analyzers/CyberChef/CyberChef_FromBase64.json
similarity index 100%
rename from analyzers/CyberChef/CyberChefFromBase64.json
rename to analyzers/CyberChef/CyberChef_FromBase64.json
diff --git a/analyzers/CyberChef/CyberChefFromCharCode.json b/analyzers/CyberChef/CyberChef_FromCharCode.json
similarity index 100%
rename from analyzers/CyberChef/CyberChefFromCharCode.json
rename to analyzers/CyberChef/CyberChef_FromCharCode.json
diff --git a/analyzers/CyberChef/CyberChefFromHex.json b/analyzers/CyberChef/CyberChef_FromHex.json
similarity index 100%
rename from analyzers/CyberChef/CyberChefFromHex.json
rename to analyzers/CyberChef/CyberChef_FromHex.json
diff --git a/analyzers/CyberChef/cyberchef.py b/analyzers/CyberChef/cyberchef.py
index b3392e9c2..eb48eccff 100755
--- a/analyzers/CyberChef/cyberchef.py
+++ b/analyzers/CyberChef/cyberchef.py
@@ -16,14 +16,10 @@ def summary(self, raw):
         taxonomies = []
         level = 'info'
         namespace = 'CyberChef'
-      
-        # Set predicate for input
-        predicate = 'input_data'
-        taxonomies.append(self.build_taxonomy(level, namespace, predicate, raw['input_data']))
  
         # Set predicate for output_data
-        predicate = 'output_data'
-        taxonomies.append(self.build_taxonomy(level, namespace, predicate, raw['output_data']))
+        predicate = self.service
+        taxonomies.append(self.build_taxonomy(level, namespace, predicate, "baked!"))
  
         return {"taxonomies": taxonomies}
    
diff --git a/analyzers/CyberChef/long.html b/analyzers/CyberChef/long.html
deleted file mode 100644
index e4be416d8..000000000
--- a/analyzers/CyberChef/long.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="panel panel-info">
-    <div class="panel-heading">
-        CyberChef Data Conversion
-    </div>
-    <div class="panel-body">
-        <table class="table table-hover">
-            <tr>
-                <th>Input</th>
-                <th>Output</th>
-            </tr>
-                <td>{{content.input_data | ellipsis:40}}</td>
-                <td>{{content.output_data}}</a></td>
-            </tr>
-        </table>
-    </div>
-</div>
diff --git a/thehive-templates/CyberChef_FromBase64_1_0/long.html b/thehive-templates/CyberChef_FromBase64_1_0/long.html
new file mode 100644
index 000000000..ec672efed
--- /dev/null
+++ b/thehive-templates/CyberChef_FromBase64_1_0/long.html
@@ -0,0 +1,37 @@
+<style>
+pre.input {
+  color: #a94442;
+  border: none;
+  font-size: 10px;
+  //word-wrap: break-word;
+  //word-break: break-all;
+  white-space: pre-wrap;
+  background-color: #f9f1f1;
+}
+pre.output {
+  //color: #367fa9;
+  border: none;
+  font-size: 10px;
+  word-wrap: break-word;
+  word-break: break-all;
+  white-space: pre-wrap;
+  background-color: black;
+}
+</style>
+
+<div class="panel panel-info">
+    <div class="panel-heading">
+        CyberChef Data Conversion
+    </div>
+    <div class="panel-body">
+        <table class="table">
+            <tr>
+                <th>Input</th>
+                <th>Output</th>
+            </tr>
+                <td width="40%"><pre class="input">{{content.input_data }}</pre></td>
+                <td><pre class="output">{{content.output_data}}</pre></td>
+            </tr>
+        </table>
+    </div>
+</div>
diff --git a/analyzers/CyberChef/short.html b/thehive-templates/CyberChef_FromBase64_1_0/short.html
similarity index 100%
rename from analyzers/CyberChef/short.html
rename to thehive-templates/CyberChef_FromBase64_1_0/short.html
diff --git a/thehive-templates/CyberChef_FromCharCode_1_0/long.html b/thehive-templates/CyberChef_FromCharCode_1_0/long.html
new file mode 100644
index 000000000..ec672efed
--- /dev/null
+++ b/thehive-templates/CyberChef_FromCharCode_1_0/long.html
@@ -0,0 +1,37 @@
+<style>
+pre.input {
+  color: #a94442;
+  border: none;
+  font-size: 10px;
+  //word-wrap: break-word;
+  //word-break: break-all;
+  white-space: pre-wrap;
+  background-color: #f9f1f1;
+}
+pre.output {
+  //color: #367fa9;
+  border: none;
+  font-size: 10px;
+  word-wrap: break-word;
+  word-break: break-all;
+  white-space: pre-wrap;
+  background-color: black;
+}
+</style>
+
+<div class="panel panel-info">
+    <div class="panel-heading">
+        CyberChef Data Conversion
+    </div>
+    <div class="panel-body">
+        <table class="table">
+            <tr>
+                <th>Input</th>
+                <th>Output</th>
+            </tr>
+                <td width="40%"><pre class="input">{{content.input_data }}</pre></td>
+                <td><pre class="output">{{content.output_data}}</pre></td>
+            </tr>
+        </table>
+    </div>
+</div>
diff --git a/thehive-templates/CyberChef_FromCharCode_1_0/short.html b/thehive-templates/CyberChef_FromCharCode_1_0/short.html
new file mode 100644
index 000000000..5fc0dabfb
--- /dev/null
+++ b/thehive-templates/CyberChef_FromCharCode_1_0/short.html
@@ -0,0 +1,3 @@
+<span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
+    {{t.namespace}}:{{t.predicate}}="{{t.value}}"
+</span>
diff --git a/thehive-templates/CyberChef_FromHex_1_0/long.html b/thehive-templates/CyberChef_FromHex_1_0/long.html
new file mode 100644
index 000000000..ec672efed
--- /dev/null
+++ b/thehive-templates/CyberChef_FromHex_1_0/long.html
@@ -0,0 +1,37 @@
+<style>
+pre.input {
+  color: #a94442;
+  border: none;
+  font-size: 10px;
+  //word-wrap: break-word;
+  //word-break: break-all;
+  white-space: pre-wrap;
+  background-color: #f9f1f1;
+}
+pre.output {
+  //color: #367fa9;
+  border: none;
+  font-size: 10px;
+  word-wrap: break-word;
+  word-break: break-all;
+  white-space: pre-wrap;
+  background-color: black;
+}
+</style>
+
+<div class="panel panel-info">
+    <div class="panel-heading">
+        CyberChef Data Conversion
+    </div>
+    <div class="panel-body">
+        <table class="table">
+            <tr>
+                <th>Input</th>
+                <th>Output</th>
+            </tr>
+                <td width="40%"><pre class="input">{{content.input_data }}</pre></td>
+                <td><pre class="output">{{content.output_data}}</pre></td>
+            </tr>
+        </table>
+    </div>
+</div>
diff --git a/thehive-templates/CyberChef_FromHex_1_0/short.html b/thehive-templates/CyberChef_FromHex_1_0/short.html
new file mode 100644
index 000000000..5fc0dabfb
--- /dev/null
+++ b/thehive-templates/CyberChef_FromHex_1_0/short.html
@@ -0,0 +1,3 @@
+<span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
+    {{t.namespace}}:{{t.predicate}}="{{t.value}}"
+</span>