diff --git a/htdocs/themes/bootstrap/js/stikked.js b/htdocs/themes/bootstrap/js/stikked.js
index 5455b3d..466c2e2 100644
--- a/htdocs/themes/bootstrap/js/stikked.js
+++ b/htdocs/themes/bootstrap/js/stikked.js
@@ -1,22 +1,14 @@
 var ST = window.ST || {};
 
 ST.init = function() {
-	ST.change();
-	//ST.expand();
 	ST.show_embed();
 };
 
-ST.change = function() {
-	$('.change').oneTime(3000,
-	function() {
-		$(this).fadeOut(2000);
-	});
-};
-
 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').on('click', function(e) {
 		e.preventDefault();
 		$(this).hide();
@@ -28,174 +20,6 @@ ST.show_embed = function() {
 	});
 };
 
-/*ST.expand = function() {
-	$('.expand').click(function() {
-		if ($('.paste').hasClass('full')) {
-			return false;
-		}
-		var window_width = $(window).width();
-		var spacer = 20;
-		if (window_width < 900) {
-			window_width = 900;
-			spacer = 0;
-		}
-		var new_width = (window_width - (spacer * 3));
-		$('.text_formatted').animate({
-			'width': new_width + 'px',
-			'left': '-' + (((window_width - 900) / 2 - spacer)) + 'px'
-		},
-		200);
-		return false;
-	});
-};*/
-
-/* Set the defaults for DataTables initialisation */
-/*
-$.extend( true, $.fn.dataTable.defaults, {
-	"sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
-	"sPaginationType": "bootstrap",
-	"oLanguage": {
-		"sLengthMenu": "_MENU_ records per page"
-	}
-} );
-
-
-// Default class modification
-$.extend( $.fn.dataTableExt.oStdClasses, {
-	"sWrapper": "dataTables_wrapper form-inline"
-} );
-
-
-// API method to get paging information
-$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
-{
-	return {
-		"iStart":         oSettings._iDisplayStart,
-		"iEnd":           oSettings.fnDisplayEnd(),
-		"iLength":        oSettings._iDisplayLength,
-		"iTotal":         oSettings.fnRecordsTotal(),
-		"iFilteredTotal": oSettings.fnRecordsDisplay(),
-		"iPage":          Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ),
-		"iTotalPages":    Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength )
-	};
-};
-
-// Bootstrap style pagination control
-$.extend( $.fn.dataTableExt.oPagination, {
-	"bootstrap": {
-		"fnInit": function( oSettings, nPaging, fnDraw ) {
-			var oLang = oSettings.oLanguage.oPaginate;
-			var fnClickHandler = function ( e ) {
-				e.preventDefault();
-				if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) {
-					fnDraw( oSettings );
-				}
-			};
-
-			$(nPaging).addClass('pagination').append(
-				'<ul>'+
-					'<li class="prev disabled"><a href="#">&larr; '+oLang.sPrevious+'</a></li>'+
-					'<li class="next disabled"><a href="#">'+oLang.sNext+' &rarr; </a></li>'+
-				'</ul>'
-			);
-			var els = $('a', nPaging);
-			$(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler );
-			$(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler );
-		},
-
-		"fnUpdate": function ( oSettings, fnDraw ) {
-			var iListLength = 5;
-			var oPaging = oSettings.oInstance.fnPagingInfo();
-			var an = oSettings.aanFeatures.p;
-			var i, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2);
-
-			if ( oPaging.iTotalPages < iListLength) {
-				iStart = 1;
-				iEnd = oPaging.iTotalPages;
-			}
-			else if ( oPaging.iPage <= iHalf ) {
-				iStart = 1;
-				iEnd = iListLength;
-			} else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) {
-				iStart = oPaging.iTotalPages - iListLength + 1;
-				iEnd = oPaging.iTotalPages;
-			} else {
-				iStart = oPaging.iPage - iHalf + 1;
-				iEnd = iStart + iListLength - 1;
-			}
-
-			for ( i=0, iLen=an.length ; i<iLen ; i++ ) {
-				// Remove the middle elements
-				$('li:gt(0)', an[i]).filter(':not(:last)').remove();
-
-				// Add the new list items and their event handlers
-				for ( j=iStart ; j<=iEnd ; j++ ) {
-					sClass = (j==oPaging.iPage+1) ? 'class="active"' : '';
-					$('<li '+sClass+'><a href="#">'+j+'</a></li>')
-						.insertBefore( $('li:last', an[i])[0] )
-						.bind('click', function (e) {
-							e.preventDefault();
-							oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength;
-							fnDraw( oSettings );
-						} );
-				}
-
-				// Add / remove disabled classes from the static elements
-				if ( oPaging.iPage === 0 ) {
-					$('li:first', an[i]).addClass('disabled');
-				} else {
-					$('li:first', an[i]).removeClass('disabled');
-				}
-
-				if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) {
-					$('li:last', an[i]).addClass('disabled');
-				} else {
-					$('li:last', an[i]).removeClass('disabled');
-				}
-			}
-		}
-	}
-} );
-
-
-// 
-// TableTools Bootstrap compatibility
-// Required TableTools 2.1+
-// 
-if ( $.fn.DataTable.TableTools ) {
-	// Set the classes that TableTools uses to something suitable for Bootstrap
-	$.extend( true, $.fn.DataTable.TableTools.classes, {
-		"container": "DTTT btn-group",
-		"buttons": {
-			"normal": "btn",
-			"disabled": "disabled"
-		},
-		"collection": {
-			"container": "DTTT_dropdown dropdown-menu",
-			"buttons": {
-				"normal": "",
-				"disabled": "disabled"
-			}
-		},
-		"print": {
-			"info": "DTTT_print_info modal"
-		},
-		"select": {
-			"row": "active"
-		}
-	} );
-
-	// Have the collection use a bootstrap compatible dropdown
-	$.extend( true, $.fn.DataTable.TableTools.DEFAULTS.oTags, {
-		"collection": {
-			"container": "ul",
-			"button": "li",
-			"liner": "a"
-		}
-	} );
-}
-*/
-
 var CM = {
 	init: function () {
 		var txtAreas = $("textarea").length;
@@ -244,24 +68,4 @@ var CM = {
 $(document).ready(function() {
 	ST.init();
 	CM.init();
-    /*
-	if($('.table').length > 0)
-	{
-		$('.table').dataTable( {
-			"sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>",
-			"sPaginationType": "bootstrap",
-			"oLanguage": {
-				"sLengthMenu": "_MENU_ records per page"
-			},
-			"aaSorting": [[4,'desc']],
-			"aoColumns": [
-				null,
-				null,
-				null,
-				null,
-				{ "iDataSort": 3}
-			]
-		} );
-	}
-    */
 });
diff --git a/htdocs/themes/bootstrap/views/view/view.php b/htdocs/themes/bootstrap/views/view/view.php
index e5dc363..2f534f8 100644
--- a/htdocs/themes/bootstrap/views/view/view.php
+++ b/htdocs/themes/bootstrap/views/view/view.php
@@ -13,12 +13,12 @@
 			<div class="row">
 				<div class="span12">
 					<div class="detail by"><?php echo lang('paste_from'); ?> <?php echo $name; ?>, <?php $p = explode(',', timespan($created, time())); echo $p[0]?> <?php echo lang('paste_ago'); ?>, <?php echo lang('paste_writtenin'); ?> <?php echo $lang; ?>.</div>
-					<?php if(isset($inreply)){?><div class="detail by"><?php echo ('paste_isareply'); ?> <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> <?php echo lang('paste_from'); ?> <?php echo $inreply['name']; ?></div><?php }?>
+					<?php if(isset($inreply)){?><div class="detail by"><?php echo lang('paste_isareply'); ?> <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> <?php echo strtolower(lang('paste_from')); ?> <?php echo $inreply['name']; ?></div><?php }?>
 					<div class="detail"><span class="item"><?php echo lang('paste_url'); ?> </span><a href="<?php echo $url; ?>"><?php echo $url; ?></a></div>
 					<?php if(!empty($snipurl)){?>
 						<div class="detail"><div class="item"><?php echo lang('paste_shorturl');?> </div><a href="<?php echo $snipurl; ?>"><?php echo htmlspecialchars($snipurl) ?></a></div>
 					<?php }?>
-					<div 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) . '" style="border:none;width:100%"></iframe>'); ?>" /></div>
+					<div 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) . '" style="border:none;width:100%"></iframe>'); ?>" /></div>
 					<div class="detail"><a class="control" href="<?php echo site_url("view/download/".$pid); ?>"><?php echo lang('paste_download'); ?></a> <?php echo lang('paste_or'); ?> <a class="control" href="<?php echo site_url("view/raw/".$pid); ?>"><?php echo lang('paste_viewraw'); ?></a> &mdash; <a href="#" class="expand control"><?php echo lang('paste_expand'); ?></a> <?php echo lang('paste_fullwidth'); ?></div>
 				</div>
 			</div>
diff --git a/htdocs/themes/default/js/stikked.js b/htdocs/themes/default/js/stikked.js
index 135425c..b2046e7 100644
--- a/htdocs/themes/default/js/stikked.js
+++ b/htdocs/themes/default/js/stikked.js
@@ -1,12 +1,5 @@
 var ST = window.ST || {}
 
-ST.change = function() {
-	$('.change').oneTime(3000,
-	function() {
-		$(this).fadeOut(2000);
-	});
-};
-
 ST.show_embed = function() {
 	$embed_field = $('#embed_field');
     var lang_showcode = $embed_field.data('lang-showcode');
@@ -58,7 +51,6 @@ ST.spamadmin = function() {
 };
 
 ST.init = function() {
-	ST.change();
 	ST.expand();
 	ST.show_embed();
 	ST.spamadmin();