'+html+'

')
+    if ($('main').html().substring(0,11) != '
')
     {
         // highlight.js expects code to be surrounded by 

-        $('div#cleartext').html('
'+ $('div#cleartext').html()+'
');
+        $('main').html('
'+ $('main').html()+'
');
     }
-    hljs.highlightBlock(document.getElementById('cleartext'));
-    $('div#cleartext').css('padding','0'); // Remove white padding around code box.
+    hljs.highlightBlock(document.getElementByTag('main'));
+    $('main').css('padding','0'); // Remove white padding around code box.
 }
 
 
@@ -193,28 +193,29 @@ function displayMessages(key, comments) {
     try { // Try to decrypt the paste.
         var cleartext = zeroDecipher(key, comments[0].data);
     } catch(err) {
-        $('div#cleartext').hide();
+        $('main').hide();
         $('button#clonebutton').hide();
         showError('Could not decrypt data (Wrong key ?)');
         return;
     }
-    setElementText($('div#cleartext'), cleartext);
-    urls2links($('div#cleartext')); // Convert URLs to clickable links.
+    setElementText($('main'), cleartext);
+    urls2links($('main')); // Convert URLs to clickable links.
 
     // comments[0] is the paste itself.
 
     if (comments[0].meta.syntaxcoloring) applySyntaxColoring();
 
     // Display paste expiration.
-    if (comments[0].meta.expire_date) $('div#remainingtime').removeClass('foryoureyesonly').text('This document will expire in '+secondsToHuman(comments[0].meta.remaining_time)+'.').show();
+    if (comments[0].meta.expire_date) $('#remainingtime').removeClass('foryoureyesonly').text('This document will expire in '+secondsToHuman(comments[0].meta.remaining_time)+'.').show();
     if (comments[0].meta.burnafterreading) {
-        $('div#remainingtime').addClass('foryoureyesonly').text('FOR YOUR EYES ONLY.  Don\'t close this window, this message can\'t be displayed again.').show();
+        $('#remainingtime').addClass('foryoureyesonly').text('FOR YOUR EYES ONLY.  Don\'t close this window, this message can\'t be displayed again.').show();
         $('button#clonebutton').hide(); // Discourage cloning (as it can't really be prevented).
     }
 
+    // If the discussion is opened on this paste, display it.
     // If the discussion is opened on this paste, display it.
     if (comments[0].meta.opendiscussion) {
-        $('div#comments').html('');
+        $('#comments').html('
Discussion
');
         // For each comment.
         for (var i = 1; i < comments.length; i++) {
             var comment=comments[i];
@@ -222,38 +223,47 @@ function displayMessages(key, comments) {
             try {
                 cleartext = zeroDecipher(key, comment.data);
             } catch(err) { }
-            var place = $('div#comments');
+            var place = $('#comments');
             // If parent comment exists, display below (CSS will automatically shift it right.)
-            var cname = 'div#comment_'+comment.meta.parentid
+            var cname = '#comment_'+comment.meta.parentid
 
             // If the element exists in page
             if ($(cname).length) {
                 place = $(cname);
             }
-            var divComment = $('
'
-                               + '
'
-                               + 'Reply'
-                               + '
');
-            setElementText(divComment.find('div.commentdata'), cleartext);
-            // Convert URLs to clickable links in comment.
-            urls2links(divComment.find('div.commentdata'));
-            divComment.find('span.nickname').html('(Anonymous)');
+            var article = $('
'
+                               /*+ '
'
+                               + 'Reply'*/
+                               + '
');
+            var footer = $('');
 
+            article.append(footer);
             // Try to get optional nickname:
             try {
-                divComment.find('span.nickname').text(zeroDecipher(key, comment.meta.nickname));
-            } catch(err) { }
-            divComment.find('span.commentdate').text('  ('+(new Date(comment.meta.postdate*1000).toString())+')').attr('title','CommentID: ' + comment.meta.commentid);
+                article.find('footer').text(zeroDecipher(key, comment.meta.nickname));
+            } catch(err) { article.find('footer').text(err) }
 
             // If an avatar is available, display it.
             if (comment.meta.vizhash) {
-                divComment.find('span.nickname').before('');
+                article.find('footer').prepend('');
             }
-
-            place.append(divComment);
+            
+            var articleDate = new Date(comment.meta.postdate*1000);
+            article.find('footer').append('' + articleDate.toString() + '');
+            article.find('time').attr('title','CommentID: ' + comment.meta.commentid).attr('datetime', articleDate.toISOString());
+            
+            var content = $('
');
+            content.append(cleartext);
+            // Convert URLs to clickable links in comment.
+            urls2links(content);
+            article.append(content);
+            
+            article.append('Reply');
+            
+            place.append(article);
         }
-        $('div#comments').append('
Add comment
');
-        $('div#discussion').show();
+        $('#comments').append('Add comment');
+        $('#comments').show();
     }
 }
 
@@ -263,18 +273,15 @@ function displayMessages(key, comments) {
  * @param string commentid = identifier of the comment we want to reply to.
  */
 function open_reply(source, commentid) {
-    $('div.reply').remove(); // Remove any other reply area.
-    source.after('
'
-                + ''
-                + ''
-                + '
Post comment'
-                + '
 
'
-                + '
');
+    $('form').remove(); // Remove any other reply area.
+    source.after('
'
+               + 'Nickname: '
+               + ''
+               + 'Post comment'
+                + '
 
'
+                + '
');
     $('input#nickname').focus(function() {
         $(this).css('color', '#000');
-        if ($(this).val() == $(this).attr('title')) {
-            $(this).val('');
-        }
     });
     $('textarea#replymessage').focus();
 }
@@ -343,10 +350,10 @@ function send_data() {
     var randomkey = sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0);
     var cipherdata = zeroCipher(randomkey, $('textarea#message').val());
     var data_to_send = { data:           cipherdata,
-                         expire:         $('select#pasteExpiration').val(),
-                         burnafterreading: $('input#burnafterreading').is(':checked') ? 1 : 0,
-                         opendiscussion: $('input#opendiscussion').is(':checked') ? 1 : 0,
-                         syntaxcoloring: $('input#syntaxcoloring').is(':checked') ? 1 : 0
+                         expire:         $('label#expiration > select').val(),
+                         burnafterreading: $('#burnafterreadingoption > input').is(':checked') ? 1 : 0,
+                         opendiscussion: $('#opendisc > input').is(':checked') ? 1 : 0,
+                         syntaxcoloring: $('#syntaxcoloringoption > input').is(':checked') ? 1 : 0
                        };
     $.post(scriptLocation(), data_to_send, 'json')
         .error(function() {
@@ -359,16 +366,16 @@ function send_data() {
                 var deleteUrl = scriptLocation() + "?pasteid=" + data.id + '&deletetoken=' + data.deletetoken;
                 showStatus('');
 
-                $('div#pastelink').html('Your paste is ' + url + ' (Hit CTRL+C to copy)');
-                $('div#deletelink').html('Delete link');
-                $('div#pasteresult').show();
+                $('#pastelink').html('Your paste is ' + url + ' (Hit CTRL+C to copy)');
+                $('#deletelink').html('Delete link');
+                $('#pasteresult').show();
                 selectText('pasteurl'); // We pre-select the link so that the user only has to CTRL+C the link.
 
-                setElementText($('div#cleartext'), $('textarea#message').val());
-                urls2links($('div#cleartext'));
+                setElementText($('main'), $('textarea#message').val());
+                urls2links($('main'));
 
                 // FIXME: Add option to remove syntax highlighting ?
-                if ($('input#syntaxcoloring').is(':checked')) applySyntaxColoring();
+                if ($('#syntaxcoloringoption > input').is(':checked')) applySyntaxColoring();
 
                 showStatus('');
             }
@@ -410,18 +417,18 @@ function stateNewPaste() {
     $('button#sendbutton').show();
     $('button#clonebutton').hide();
     $('button#rawtextbutton').hide();
-    $('div#expiration').show();
-    $('div#remainingtime').hide();
-    $('div#burnafterreadingoption').show();
-    $('div#opendisc').show();
-    $('div#syntaxcoloringoption').show();
+    $('#expiration').show();
+    $('#remainingtime').hide();
+    $('#burnafterreadingoption').show();
+    $('#opendisc').show();
+    $('#syntaxcoloringoption').show();
     $('button#newbutton').show();
-    $('div#pasteresult').hide();
+    $('#pasteresult').hide();
     $('textarea#message').text('');
     $('textarea#message').show();
-    $('div#cleartext').hide();
-    $('div#message').focus();
-    $('div#discussion').hide();
+    $('main').hide();
+    $('#message').focus();
+    $('section#comments').hide();
 }
 
 /**
@@ -431,7 +438,7 @@ function stateExistingPaste() {
     $('button#sendbutton').hide();
 
     // No "clone" for IE<10.
-    if ($('div#oldienotice').is(":visible")) {
+    if ($('#oldienotice').is(":visible")) {
         $('button#clonebutton').hide();
     }
     else {
@@ -439,14 +446,14 @@ function stateExistingPaste() {
     }
     $('button#rawtextbutton').show();
 
-    $('div#expiration').hide();
-    $('div#burnafterreadingoption').hide();
-    $('div#opendisc').hide();
-    $('div#syntaxcoloringoption').hide();    
+    $('#expiration').hide();
+    $('#burnafterreadingoption').hide();
+    $('#opendisc').hide();
+    $('#syntaxcoloringoption').hide();    
     $('button#newbutton').show();
-    $('div#pasteresult').hide();
+    $('#pasteresult').hide();
     $('textarea#message').hide();
-    $('div#cleartext').show();
+    $('main').show();
 }
 
 /** Return raw text
@@ -454,7 +461,7 @@ function stateExistingPaste() {
 function rawText()
 {
     history.pushState(document.title, document.title, 'document.txt');
-    var paste = $('div#cleartext').text();
+    var paste = $('main').text();
     var newDoc = document.open('text/plain', 'replace');
     newDoc.write(paste);
     newDoc.close();
@@ -470,7 +477,7 @@ function clonePaste() {
     history.replaceState(document.title, document.title, scriptLocation());
     
     showStatus('');
-    $('textarea#message').text($('div#cleartext').text());
+    $('textarea#message').text($('main').text());
 }
 
 /**
@@ -487,8 +494,8 @@ function newPaste() {
  * (We use the same function for paste and reply to comments)
  */
 function showError(message) {
-    $('div#status').addClass('errorMessage').text(message);
-    $('div#replystatus').addClass('errorMessage').text(message);
+    $('#status').addClass('errorMessage').text(message);
+    $('#replystatus').addClass('errorMessage').text(message);
 }
 
 /**
@@ -499,22 +506,22 @@ function showError(message) {
  * @param boolean spin (optional) : tell if the "spinning" animation should be displayed.
  */
 function showStatus(message, spin) {
-    $('div#replystatus').removeClass('errorMessage');
-    $('div#replystatus').text(message);
+    $('#replystatus').removeClass('errorMessage');
+    $('#replystatus').text(message);
     if (!message) {
-        $('div#status').html(' ');
+        $('#status').html(' ');
         return;
     }
     if (message == '') {
-        $('div#status').html(' ');
+        $('#status').html(' ');
         return;
     }
-    $('div#status').removeClass('errorMessage');
-    $('div#status').text(message);
+    $('#status').removeClass('errorMessage');
+    $('#status').text(message);
     if (spin) {
         var img = '';
-        $('div#status').prepend(img);
-        $('div#replystatus').prepend(img);
+        $('#status').prepend(img);
+        $('#replystatus').prepend(img);
     }
 }
 
@@ -562,28 +569,28 @@ function pageKey() {
 $(function() {
 
     // If "burn after reading" is checked, disable discussion.
-    $('input#burnafterreading').change(function() {
+    $('#burnafterreadingoption > input').change(function() {
         if ($(this).is(':checked') ) { 
-            $('div#opendisc').addClass('buttondisabled');
-            $('input#opendiscussion').attr({checked: false});
-            $('input#opendiscussion').attr('disabled',true);
+            $('#opendisc').addClass('buttondisabled');
+            $('#opendisc > input').attr({checked: false});
+            $('#opendisc > input').attr('disabled',true);
         }
         else {
-            $('div#opendisc').removeClass('buttondisabled');
-            $('input#opendiscussion').removeAttr('disabled');
+            $('#opendisc').removeClass('buttondisabled');
+            $('#opendisc > input').removeAttr('disabled');
         }
     });
 
     // Display status returned by php code if any (eg. Paste was properly deleted.)
-    if ($('div#status').text().length > 0) {
-        showStatus($('div#status').text(),false);
+    if ($('#status').text().length > 0) {
+        showStatus($('#status').text(),false);
         return;
     }
 
-    $('div#status').html(' '); // Keep line height even if content empty.
+    $('#status').html(' '); // Keep line height even if content empty.
 
     // Display an existing paste
-    if ($('div#cipherdata').text().length > 1) {
+    if ($('#cipherdata').text().length > 1) {
         // Missing decryption key in URL ?
         if (window.location.hash.length == 0) {
             showError('Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL ?)');
@@ -591,7 +598,7 @@ $(function() {
         }
 
         // List of messages to display
-        var messages = jQuery.parseJSON($('div#cipherdata').text());
+        var messages = jQuery.parseJSON($('#cipherdata').text());
 
         // Show proper elements on screen.
         stateExistingPaste();
@@ -599,8 +606,8 @@ $(function() {
         displayMessages(pageKey(), messages);
     }
     // Display error message from php code.
-    else if ($('div#errormessage').text().length>1) {
-        showError($('div#errormessage').text());
+    else if ($('#errormessage').text().length>1) {
+        showError($('#errormessage').text());
     }
     // Create a new paste.
     else {
diff --git a/tpl/page.html b/tpl/page.html
index 5499847f..d6f47ef7 100644
--- a/tpl/page.html
+++ b/tpl/page.html
@@ -1,88 +1,94 @@
+
+
 
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  
+    
+    
+    
+    
+    
+     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
   
-      

-          ZeroBin is a minimalist, opensource online pastebin where the server has zero knowledge of pasted data.
-          Data is encrypted/decrypted in the browser using 256 bits AES. 
-          More information on the project page.

-          ▶ Note: This is a test service: 
-          Data may be deleted anytime. Kittens will die if you abuse this service.
-
-    
ZeroBin


-    
Because ignorance is bliss


-    
{$VERSION}
-    
-    
ZeroBin requires a modern browser to work.
-    
Still using Internet Explorer ?  Do yourself a favor, switch to a modern browser: 
-        Firefox, 
-        Opera, 
-        Chrome, 
-        Safari...
-    
-    
{$STATUS}
-    
{$ERRORMESSAGE|htmlspecialchars}
-    

-    New
-    Send
-    Clone
-    Raw text
-      
Expires: 
-      
-        5 minutes
-        10 minutes
-        1 hour
-        1 day
-        1 week
-        1 month
-        1 year
-        Never
-      
-      
-      

-      

-         
-         Burn after reading
-      
-      

-         
-         Open discussion
-      
-      

-         
-         Syntax coloring
-      
-    
-    

-      

-      

-    
-    

+    

+      
+      
ZeroBin
+      
Because ignorance is bliss
+    
{$VERSION}
+    
+    
+    
+    
+    
+    
+    
{$STATUS}
+    
{$ERRORMESSAGE|htmlspecialchars}
+    
+      New
+      Send
+      Clone
+      Raw text
+      Expires: 
+        
+          5 minutes
+          10 minutes
+          1 hour
+          1 day
+          1 week
+          1 month
+          1 year
+          Never
+        
+      
+      

+      
+      
+         Burn after reading
+      
+      
+         Open discussion
+      
+      
+         Syntax coloring
+      
+    
+    

+      

+      

+    
+    

     
-    

-        
Discussion
-        

-    
+    

     
{$CIPHERDATA}