diff --git a/app/locales/fr.yml b/app/locales/fr.yml
index d51c1e7..a856fa0 100644
--- a/app/locales/fr.yml
+++ b/app/locales/fr.yml
@@ -34,7 +34,7 @@ form:
         choice:
             yes: 'Oui'
             no: 'Non'
-    submit: 'Send'
+    submit: 'Envoyer'
     type:
         label: 'Langage : %value%'
         choice:
diff --git a/bower.json b/bower.json
index 716f91d..7288ac5 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
   "homepage": "https://gitlab.deblan.org/deblan/gist.deblan.org",
   "dependencies": {
     "bootstrap": "3.3.4",
-	"flag-icon-css": "0.7.1"
+    "flag-icon-css": "0.7.1",
+    "SyntaxHighlighter": "3.0.83"
   }
 }
diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig
index 8c8e3b5..edc28af 100644
--- a/src/Gist/Resources/views/View/view.html.twig
+++ b/src/Gist/Resources/views/View/view.html.twig
@@ -3,9 +3,16 @@
 {% block css %}
     <link rel="stylesheet" href="{{ web_path }}app/css/geshi/vibrant-ink.css" />
 
+    {% if gist.cipher %}
+        <link type="text/css" rel="Stylesheet" href="{{ web_path }}components/SyntaxHighlighter/styles/shCoreRDark.css" />
+        <link type="text/css" rel="Stylesheet" href="{{ web_path }}components/SyntaxHighlighter/styles/shThemeRDark.css" />
+    {% endif %}
+
     {{ parent() }}
 {% endblock %}
 
+{% block title %}{{ gist.title ? gist.title : 'gist.untitled'|trans }} - {{ commit|slice(0, 10) }}{% endblock %}
+
 {% block body %}
     <div class="row">
         <div class="col-md-12">
@@ -66,7 +73,7 @@
 
                             <div id="viewer">
                                 {% if gist.cipher %}
-                                    <pre>{{ content }}</pre>
+                                    <pre class="brush: js; syntaxhighlighter">{{ raw_content|raw }}</pre>
                                 {% else %}
                                     {{ content|raw }}
                                 {% endif %}
@@ -117,4 +124,37 @@
 
 {% block js %}
     {{ parent() }}
+    
+    {% if gist.cipher %}
+        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/XRegExp.js"></script> <!-- XRegExp is bundled with the final shCore.js during build -->
+        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shCore.js"></script>
+        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shAutoloader.js"></script>
+        <script type="text/javascript">
+            SyntaxHighlighter.autoloader(
+                ['applescript',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAppleScript.js' ],
+                ['actionscript3', 'as3',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAS3.js' ],
+                ['bash', 'shell',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushBash.js' ],
+                ['coldfusion', 'cf',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushColdFusion.js' ],
+                ['cpp', 'c',                       '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCpp.js' ],
+                ['c#', 'c-sharp', 'csharp',        '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCSharp.js' ],
+                ['css',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCss.js' ],
+                ['delphi', 'pascal',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDelphi.js' ],
+                ['diff', 'patch', 'pas',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDiff.js' ],
+                ['erl', 'erlang',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushErlang.js' ],
+                ['groovy',                         '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushGroovy.js' ],
+                ['java',                           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJava.js' ],
+                ['jfx', 'javafx',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJavaFX.js' ],
+                ['js', 'jscript', 'javascript',    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJScript.js' ],
+                ['perl', 'pl',                     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPerl.js' ],
+                ['php',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPhp.js' ],
+                ['text', 'plain',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPlain.js' ],
+                ['py', 'python',                   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPython.js' ],
+                ['ruby', 'rails', 'ror', 'rb',     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushRuby.js' ],
+                ['scala',                          '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushScala.js' ],
+                ['sql',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushSql.js' ],
+                ['vb', 'vbnet',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushVb.js' ],
+                ['xml', 'xhtml', 'xslt', 'html',   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushXml.js' ]
+            );
+        </script>
+    {% endif %}
 {% endblock %}
diff --git a/web/app/js/app.js b/web/app/js/app.js
index a116502..6ecc1d4 100644
--- a/web/app/js/app.js
+++ b/web/app/js/app.js
@@ -66,9 +66,9 @@ var editorEvents = function() {
         $(this).trigger('change');
     });
 
-	$('.show-diff').click(function() {
-		$($(this).data('target')).toggle();
-	});
+    $('.show-diff').click(function() {
+        $($(this).data('target')).toggle();
+    });
 }
 
 var mainEditorEvents = function() {
@@ -94,8 +94,28 @@ var mainEditorEvents = function() {
     });
 }
 
+var viewerEvents = function() {
+    if (0 === $('.syntaxhighlighter').length) {
+        return;
+    }
+
+    $(document).ready(function() {
+        var url = document.location.href;
+        var parts = url.split('#key=');
+
+        if (parts.length === 2) {
+            var decrypted = CryptoJS.AES.decrypt($('.syntaxhighlighter').html(), parts[1], {
+                format: JsonFormatter
+            });
+            $('.syntaxhighlighter').text(decrypted.toString(CryptoJS.enc.Utf8));
+            SyntaxHighlighter.all();
+        }
+    });
+}
+
 var bootstrap = function() {
     editorEvents();
+    viewerEvents();
     mainEditorEvents();
 }