diff --git a/README.md b/README.md
index bcb89bc..83de689 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ a code editor.
 - Search & highlight text in the treeview.
 - Undo and redo all actions.
 - Load and save files and urls.
-- Format, compact, and inspect JSON in a code editor powered by [Ace](http://ace.ajax.org/).
+- Format, compact, and inspect JSON in the code editor powered by [Ace](http://ace.ajax.org/).
 - Library can be loaded as CommonJS module, AMD module, or as a regular javascript file.
 
 
diff --git a/app/chrome/manifest.json b/app/chrome/manifest.json
index 78fe027..51079ee 100644
--- a/app/chrome/manifest.json
+++ b/app/chrome/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "JSON Editor",
     "version": "2.1.0",
-    "description": "JSON Editor is a tool to view, edit, and format JSON. It shows your data in an editable treeview and in a code editor with syntax highlighting.",
+    "description": "JSON Editor is a tool to view, edit, and format JSON. It shows your data in an editable treeview and in a code editor.",
     "app": {
         "urls": [
             "http://jsoneditoronline.org/",
diff --git a/app/web/doc/img/jsonformatter.png b/app/web/doc/img/jsonformatter.png
index 272c2eb..0c2fdb9 100644
Binary files a/app/web/doc/img/jsonformatter.png and b/app/web/doc/img/jsonformatter.png differ
diff --git a/app/web/doc/index.html b/app/web/doc/index.html
index e25e85c..3f9717b 100644
--- a/app/web/doc/index.html
+++ b/app/web/doc/index.html
@@ -13,7 +13,7 @@
     <p>
         JSON Editor Online is a web-based tool to view, edit, and format JSON.
         It shows your data side by side in a clear, editable treeview and in
-        formatted plain text.
+        a code editor.
     </p>
     <p>
         Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+.
@@ -57,10 +57,10 @@
     </p>
     <img src="img/splitter.png">
 
-    <h2 id="formatter">Formatter</h2>
+    <h2 id="formatter"> Formatter</h2>
     <p>
-        The JSON Formatter displays JSON data in plain text.
-        The Formatter is capable of formatting and compacting JSON.
+        The JSON Formatter displays JSON data in a code editor.
+        The Formatter is capable of formatting, compacting, and inspecting JSON.
     </p>
     <img src="img/jsonformatter.png">
     <p>
diff --git a/app/web/index.html b/app/web/index.html
index 14d78b6..14ece03 100644
--- a/app/web/index.html
+++ b/app/web/index.html
@@ -13,7 +13,7 @@
     @brief
     JSON Editor Online is a web-based tool to view, edit, and format JSON.
     It shows your data side by side in a clear, editable treeview and in 
-    formatted plain text.
+    a code editor.
 
     Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+
 
@@ -40,7 +40,7 @@
     @date     2013-03-08
     -->
 
-    <meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.">
+    <meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in a code editor.">
     <meta name="keywords" content="json, editor, formatter, online, format, parser, json editor, json editor online, online json editor, javascript, javascript object notation, tools, tool, json tools, treeview, open source, free, json parser, json parser online, json formatter, json formatter online, online json formatter, online json parser, format json online">
     <meta name="author" content="Jos de Jong">
 
diff --git a/app/web/test.html b/app/web/test.html
index f50fe91..ff13710 100644
--- a/app/web/test.html
+++ b/app/web/test.html
@@ -12,7 +12,7 @@
     @brief
     JSON Editor Online is a web-based tool to view, edit, and format JSON.
     It shows your data side by side in a clear, editable treeview and in 
-    formatted plain text.
+    a code editor.
     
     Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+
 
@@ -39,7 +39,7 @@
     @date     2013-03-08
     -->
 
-    <meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.">
+    <meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in a code editor.">
     <meta name="keywords" content="json, editor, formatter, online, format, parser, json editor, json editor online, online json editor, javascript, javascript object notation, tools, tool, json tools, treeview, open source, free, json parser, json parser online, json formatter, json formatter online, online json formatter, online json parser, format json online">
     <meta name="author" content="Jos de Jong">
 
diff --git a/misc/screenshots/description.json b/misc/screenshots/description.json
index d163931..6957da6 100644
--- a/misc/screenshots/description.json
+++ b/misc/screenshots/description.json
@@ -3,15 +3,15 @@
     "Website": "http://jsoneditoronline.org",
     "Version": 2.0,
     "Free": true,
-    "Description": "JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.",
+    "Description": "JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in a code editor.",
     "Features": [
-        "View and edit JSON side by side in treeview and plain text.",
+        "View and edit JSON side by side in treeview and a code editor.",
         "Edit, add, move, remove, and duplicate fields and values.",
         "Change type of values.",
         "Colorized values, color depends of the value type.",
         "Search & highlight text in the treeview.",
         "Undo and redo all actions.",
         "Load and save file and urls.",
-        "Format and compact JSON in plain text."
+        "Format, compact, and inspect JSON in the code editor."
     ]
 }
\ No newline at end of file