diff --git a/bower.json b/bower.json
index b86ba55..f1f83b6 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gist",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "authors": [
     "Simon Vieille <simon@deblan.fr>"
   ],
diff --git a/src/Gist/Resources/views/Edit/clone.html.twig b/src/Gist/Resources/views/Edit/clone.html.twig
index 482867b..b4f5683 100644
--- a/src/Gist/Resources/views/Edit/clone.html.twig
+++ b/src/Gist/Resources/views/Edit/clone.html.twig
@@ -1,5 +1,7 @@
 {% extends 'base.html.twig' %}
 
+{% block title %}{{ gist.title ? gist.title : 'gist.untitled'|trans }} - {{ 'gist.action.clone'|trans }}{% endblock %}
+
 {% block body %}
     <div class="row">
         <form action="" method="post" id="main-form">
diff --git a/src/Gist/Resources/views/Edit/index.html.twig b/src/Gist/Resources/views/Edit/index.html.twig
index ecaa6c6..d778bae 100644
--- a/src/Gist/Resources/views/Edit/index.html.twig
+++ b/src/Gist/Resources/views/Edit/index.html.twig
@@ -1,5 +1,7 @@
 {% extends 'base.html.twig' %}
 
+{% block title %}{{ 'app.menu.home.title'|trans }}{% endblock %}
+
 {% block body %}
     <div class="row">
         <form action="{{ path('home') }}" method="post" id="main-form">
diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig
index 3a6b13b..074cce3 100644
--- a/src/Gist/Resources/views/View/embed.html.twig
+++ b/src/Gist/Resources/views/View/embed.html.twig
@@ -1,10 +1,15 @@
 {% extends 'base.html.twig' %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ web_path }}app/css/geshi/vibrant-ink.css" />
-    
-    {{ parent() }}
+    {% 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" />
+    {% else %}
+        <link rel="stylesheet" href="{{ web_path }}app/css/geshi/vibrant-ink.css" />
+    {% endif %}
 
+    {{ parent() }}
+    
     <style type="text/css">
         #embed {
             padding: 0;
@@ -23,9 +28,9 @@
             padding: 0;
         }
 
-		.panel {
-			margin-bottom: 0;
-		}
+        .panel {
+            margin-bottom: 0;
+        }
 
         pre ol {
             padding-left: 0 !important;
@@ -90,4 +95,37 @@
     {{ parent() }}
 
     <script type="text/javascript" src="{{ web_path }}components/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script>
+
+    {% 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/src/Gist/Resources/views/View/embedJs.html.twig b/src/Gist/Resources/views/View/embedJs.html.twig
index 190a645..064a424 100644
--- a/src/Gist/Resources/views/View/embedJs.html.twig
+++ b/src/Gist/Resources/views/View/embedJs.html.twig
@@ -1,10 +1,17 @@
 (function() {
     var iFrameResizeLoaded = function() {
+        var div = document.getElementById('gist-{{ gist.file }}-{{ commit }}');
         var iframeId = 'gist-' + (Math.floor(Math.random() * (10000 - 1)) + 1).toString();
         var iframe = document.createElement('iframe');
+        var url = '{{ app.request.getSchemeAndHttpHost() ~ path('embed', app.request.attributes.get('_route_params')|merge({_locale: 'en'})) }}';
+        
+        if (div.getAttribute('data-key')) {
+            url = [url, div.getAttribute('data-key')].join('');
+        }
+
         iframe.setAttribute('id', iframeId);
         iframe.setAttribute('frameborder', 0);
-        iframe.setAttribute('src', '{{ app.request.getSchemeAndHttpHost() ~ path('embed', app.request.attributes.get('_route_params')|merge({_locale: 'en'})) }}');
+        iframe.setAttribute('src', url);
         iframe.setAttribute('style', 'width: 100%');
         document.getElementById('gist-{{ gist.file }}-{{ commit }}').appendChild(iframe);
 
diff --git a/src/Gist/Resources/views/View/revisions.html.twig b/src/Gist/Resources/views/View/revisions.html.twig
index c89ada5..1040117 100644
--- a/src/Gist/Resources/views/View/revisions.html.twig
+++ b/src/Gist/Resources/views/View/revisions.html.twig
@@ -6,6 +6,8 @@
     {{ parent() }}
 {% endblock %}
 
+{% block title %}{{ gist.title ? gist.title : 'gist.untitled'|trans }} - {{ 'gist.action.history'|trans }}{% endblock %}
+
 {% block body %}
     <div class="row">
         <div class="col-md-12">
diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig
index bc6566b..c248e41 100644
--- a/src/Gist/Resources/views/View/view.html.twig
+++ b/src/Gist/Resources/views/View/view.html.twig
@@ -1,11 +1,11 @@
 {% extends 'base.html.twig' %}
 
 {% 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" />
+    {% else %}
+        <link rel="stylesheet" href="{{ web_path }}app/css/geshi/vibrant-ink.css" />
     {% endif %}
 
     {{ parent() }}
@@ -68,47 +68,11 @@
                                 {% endif %}
                             </div>
 
-							<p id="embed" class="pull-right">
-								{{ 'gist.action.embed'|trans }}
-								<input type="text" class="form-control" value="{{ '<div id="gist-' ~ gist.file ~ '-' ~ commit ~ '" class="gist-container"></div><script src="' ~ app.request.getSchemeAndHttpHost() ~ path('embedjs', app.request.attributes.get('_route_params')) ~ '"></script>' }}" />
-							</p>
+                            <p id="embed" class="pull-right">
+                                {{ 'gist.action.embed'|trans }}
+                                <input type="text" class="form-control" id="embed-input" value="{{ '<div%key%id="gist-' ~ gist.file ~ '-' ~ commit ~ '" class="gist-container"></div><script src="' ~ app.request.getSchemeAndHttpHost() ~ path('embedjs', app.request.attributes.get('_route_params')) ~ '"></script>' }}" />
+                            </p>
                         </div>
-                        {% if not gist.cipher %}
-                            <div id="revisions" class="tab-pane out">
-                                {% for commit in history %}
-                                    <div class="commit">
-                                        <p>
-                                            <a href="{{ path('view', {gist: gist.file, commit: commit.commit}) }}" class="btn btn-warning btn-sm">
-                                                {{ commit.commit|slice(0, 10) }}
-                                            </a>
-
-                                            {% if loop.first %}<span class="btn btn-info btn-sm">init</span>{% endif %}
-                                            
-                                            {% if not loop.first %}
-                                                <a href="#diff-{{ loop.index }}" data-target="#diff-{{ loop.index }}" class="btn btn-default btn-sm show-diff">
-                                                    diff
-                                                </a>
-                                            {% endif %}
-                                        </p>
-                                        <p>
-                                            {{ commit.date|date('date.format'|trans) }}
-                                        </p>
-                                        <div>
-                                            {% if not loop.first %}
-
-                                                <div class="diff" id="diff-{{ loop.index }}">
-                                                    {{ commit.diff|raw }}
-                                                </div>
-                                            {% endif %}
-                                        </div>
-                                    </div>
-
-                                    {% if not loop.last %}
-                                        <hr />    
-                                    {% endif %}
-                                {% endfor %}
-                            </div>
-                        {% endif %}
                     </div>
                 </div>
             </div>
diff --git a/web/app/js/app.js b/web/app/js/app.js
index 5ed69b0..e9fc483 100644
--- a/web/app/js/app.js
+++ b/web/app/js/app.js
@@ -100,23 +100,37 @@ var mainEditorEvents = function() {
     });
 }
 
+var getKey = function() {
+    var url = document.location.href;
+    var parts = url.split('#key=');
+
+    if (parts.length === 2) {
+        return parts[1];
+    }
+
+    return null;
+}
+
 var viewerEvents = function() {
     var $render = $('.syntaxhighlighter');
 
-    if (0 === $render.length) {
-        return;
-    }
-
     $(document).ready(function() {
-        var url = document.location.href;
-        var parts = url.split('#key=');
+        var key = getKey();
+        var $embedInput = $('#embed-input');
+        var to = ' ';
 
-        if (parts.length === 2) {
-            var decrypted = CryptoJS.AES.decrypt($render.html(), parts[1], {
+        if (0 !== $render.length && key) {
+            var decrypted = CryptoJS.AES.decrypt($render.html(), key, {
                 format: JsonFormatter
             });
             $render.text(decrypted.toString(CryptoJS.enc.Utf8));
             SyntaxHighlighter.all();
+
+            to = ' data-key="#key=' + key + '" ';
+        }
+
+        if ($embedInput.length) {
+            $embedInput.val($embedInput.val().replace('%key%', to));
         }
     });
 }