diff --git a/htdocs/application/language/english/stikked_lang.php b/htdocs/application/language/english/stikked_lang.php
index 0b63472..34f410f 100644
--- a/htdocs/application/language/english/stikked_lang.php
+++ b/htdocs/application/language/english/stikked_lang.php
@@ -10,13 +10,15 @@ $lang['paste_lang'] = 'Language';
 $lang['paste_lang_desc'] = 'What language is your paste written in?';
 $lang['paste_yourpaste'] = 'Your paste';
 $lang['paste_yourpaste_desc'] = 'Paste your paste here';
-$lang['paste_syntaxhl'] = 'Enable syntax highlighting';
+$lang['paste_enablesynhl'] = 'Enable realtime syntax highlighting';
+$lang['paste_disablesynhl'] = 'Disable realtime syntax highlighting';
 $lang['paste_shorturl'] = 'Create Shorturl';
 $lang['paste_shorturl_desc'] = 'Create a shorter url that redirects to your paste?';
 $lang['paste_private'] = 'Private';
 $lang['paste_private_desc'] = 'Private paste aren\'t shown in recent listings.';
 $lang['paste_delete'] = 'Delete After';
 $lang['paste_delete_desc'] = 'When should we delete your paste?';
+$lang['paste_recent'] = 'Recent Pastes';
 $lang['paste_trending'] = 'Trending Pastes';
 $lang['paste_from'] = 'From';
 $lang['paste_ago'] = 'ago';
@@ -30,6 +32,7 @@ $lang['paste_goback'] = 'go back';
 $lang['paste_url'] = 'URL';
 $lang['paste_shorturl'] = 'Shorturl';
 $lang['paste_embed'] = 'Embed';
+$lang['paste_showcode'] = 'Show code';
 $lang['paste_download'] = 'Download Paste';
 $lang['paste_or'] = 'or';
 $lang['paste_and'] = 'and';
diff --git a/htdocs/application/language/swissgerman/stikked_lang.php b/htdocs/application/language/swissgerman/stikked_lang.php
index 1481887..1d402e8 100644
--- a/htdocs/application/language/swissgerman/stikked_lang.php
+++ b/htdocs/application/language/swissgerman/stikked_lang.php
@@ -10,7 +10,8 @@ $lang['paste_lang'] = 'Sprooch';
 $lang['paste_lang_desc'] = 'In welärä Sprooch isch das gschriibä?';
 $lang['paste_yourpaste'] = 'Din Paste';
 $lang['paste_yourpaste_desc'] = 'Gisch di Sänf derzue';
-$lang['paste_syntaxhl'] = 'Ächtzyt syntax highlighting aaschalte (isch imfall geil!)';
+$lang['paste_enablesynhl'] = 'Ächtzyt syntax highlighting aaschalte (isch imfall geil!)';
+$lang['paste_disablesynhl'] = 'Ächtzyt syntax highlighting widr abschalte';
 $lang['paste_shorturl'] = 'Churz-URL erstellä';
 $lang['paste_shorturl_desc'] = 'Chürzeri URL erstelle, damits noone bitzeli schööner usgseht';
 $lang['paste_private'] = 'Privat';
@@ -31,6 +32,7 @@ $lang['paste_goback'] = 'gang zrugg';
 $lang['paste_url'] = 'URL';
 $lang['paste_shorturl'] = 'Churzurl';
 $lang['paste_embed'] = 'Ibettä';
+$lang['paste_showcode'] = 'Code aazeige';
 $lang['paste_download'] = 'Paste abelade';
 $lang['paste_or'] = 'odr';
 $lang['paste_and'] = 'und';
diff --git a/htdocs/themes/default/js/codemirror_exec.js b/htdocs/themes/default/js/codemirror_exec.js
index 1b42884..e49f640 100644
--- a/htdocs/themes/default/js/codemirror_exec.js
+++ b/htdocs/themes/default/js/codemirror_exec.js
@@ -3,8 +3,11 @@ var CM = window.CM || {}
 CM.enabled = false;
 
 CM.init = function() {
+    var $enable_codemirror = $('#enable_codemirror');
+    var lang_enablesynhl = $enable_codemirror.data('lang-enablesynhl');
+    $enable_codemirror.text(lang_enablesynhl);
 	CM.modes = $.parseJSON($('#codemirror_modes').text());
-	$('#enable_codemirror').click(function() {
+	$enable_codemirror.click(function() {
 		$('#lang').change(function() {
 			CM.set_language();
 		});
@@ -15,11 +18,14 @@ CM.init = function() {
 };
 
 CM.toggle = function() {
+    var $enable_codemirror = $('#enable_codemirror');
+    var lang_enablesynhl = $enable_codemirror.data('lang-enablesynhl');
+    var lang_disablesynhl = $enable_codemirror.data('lang-disablesynhl');
 	if (CM.enabled) {
 		CM.editor.toTextArea();
 		CM.editor = undefined;
 		$('#lang').unbind();
-		$('#enable_codemirror').text('Enable syntax highlighting');
+		$enable_codemirror.text(lang_enablesynhl);
 		CM.enabled = false;
 	} else {
 		if (typeof CM.editor == 'undefined') {
@@ -28,7 +34,7 @@ CM.toggle = function() {
 				lineWrapping: true,
 			});
 		}
-		$('#enable_codemirror').text('Disable syntax highlighting');
+		$enable_codemirror.text(lang_disablesynhl);
 		CM.enabled = true;
 	}
 };
diff --git a/htdocs/themes/default/js/stikked.js b/htdocs/themes/default/js/stikked.js
index 93efa15..135425c 100644
--- a/htdocs/themes/default/js/stikked.js
+++ b/htdocs/themes/default/js/stikked.js
@@ -9,8 +9,9 @@ ST.change = function() {
 
 ST.show_embed = function() {
 	$embed_field = $('#embed_field');
+    var lang_showcode = $embed_field.data('lang-showcode');
 	$embed_field.hide();
-	$embed_field.after('<a id="show_code" href="#">Show code</a>');
+	$embed_field.after('<a id="show_code" href="#">' + lang_showcode + '</a>');
 	$('#show_code').live('click',
 	function() {
 		$(this).hide();
@@ -20,6 +21,7 @@ ST.show_embed = function() {
 };
 
 ST.expand = function() {
+    $('.expander').show();
 	$('.expand').click(function() {
 		if ($('.paste').hasClass('full')) {
 			return false;
diff --git a/htdocs/themes/default/views/defaults/paste_form.php b/htdocs/themes/default/views/defaults/paste_form.php
index edde274..f3cd8fb 100644
--- a/htdocs/themes/default/views/defaults/paste_form.php
+++ b/htdocs/themes/default/views/defaults/paste_form.php
@@ -45,7 +45,7 @@
 		<div class="item">
 			<label for="paste"><?php echo lang('paste_yourpaste'); ?>
 				<span class="instruction"><?php echo lang('paste_yourpaste_desc'); ?></span>
-                <span class="instruction"><a href="#" id="enable_codemirror"><?php echo lang('paste_syntaxhl'); ?></a></span>
+                <span class="instruction"><a href="#" id="enable_codemirror" data-lang-enablesynhl="<?php echo lang('paste_enablesynhl'); ?>" data-lang-disablesynhl="<?php echo lang('paste_disablesynhl'); ?>"></a></span>
 			</label>
 			
 			<textarea id="code" name="code" cols="40" rows="20" tabindex="4"><?php if(isset($paste_set)){ echo $paste_set; }?></textarea>
diff --git a/htdocs/themes/default/views/view/view.php b/htdocs/themes/default/views/view/view.php
index e7bcbcc..62eb486 100644
--- a/htdocs/themes/default/views/view/view.php
+++ b/htdocs/themes/default/views/view/view.php
@@ -31,7 +31,7 @@ if(isset($insert)){
 			<?php if(!empty($snipurl)){?>
 				<span class="detail"><span class="item"><?php echo lang('paste_shorturl'); ?> </span><a href="<?php echo $snipurl; ?>"><?php echo htmlspecialchars($snipurl) ?></a></span>
 			<?php }?>
-			<span class="detail"><span class="item"><?php echo lang('paste_embed'); ?> </span><input id="embed_field" type="text" value="<?php echo htmlspecialchars('<iframe src="' . site_url('view/embed/' . $pid . '/' . $seg3) . '" style="border:none;width:100%"></iframe>'); ?>" /></span>
+			<span class="detail"><span class="item"><?php echo lang('paste_embed'); ?> </span><input data-lang-showcode="<?php echo lang('paste_showcode'); ?>" id="embed_field" type="text" value="<?php echo htmlspecialchars('<iframe src="' . site_url('view/embed/' . $pid . '/' . $seg3) . '" style="border:none;width:100%"></iframe>'); ?>" /></span>
 			<div class="spacer"></div>
 			
 			<span class="detail">
@@ -40,7 +40,8 @@ if(isset($insert)){
 <?php }else{ ?>
             <?php echo lang('paste_viewdiffs'); ?> <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> <?php echo lang('paste_and'); ?> <a href="<?php echo $url; ?>"><?php echo $title; ?></a>
 <?php } ?>
-            &mdash; <a href="#" class="expand control"><?php echo lang('paste_expand'); ?></a> <?php echo lang('paste_fullwidth'); ?></span>
+            <span class="expander hidden">&mdash; <a href="#" class="expand control"><?php echo lang('paste_expand'); ?></a> <?php echo lang('paste_fullwidth'); ?></span>
+            </span>
 		</div>
 	</div>
 </div>