diff --git a/inde.html b/inde.html
index 87e71f8..e5ce0a2 100644
--- a/inde.html
+++ b/inde.html
@@ -1,19 +1,70 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Javascript Tetris</title>
   <style>
-    body      { font-family: Helvetica, sans-serif; }
-    #tetris   { margin: 1em auto; padding: 1em; border: 4px solid black; border-radius: 10px; background-color: #F8F8F8; }
+    :root {
+      --page-background: #FFFFFF;
+      --panel-background: #F8F8F8;
+      --text-color: #000000;
+      --border-color: #000000;
+      --canvas-background: url(texture.jpg);
+      --canvas-shadow: #999999;
+      --upcoming-background: #E0E0E0;
+      --button-background: #FFFFFF;
+    }
+
+    body      { font-family: Helvetica, sans-serif; background-color: var(--page-background); color: var(--text-color); }
+    body.dark-mode {
+      --page-background: #121212;
+      --panel-background: #242424;
+      --text-color: #F5F5F5;
+      --border-color: #F5F5F5;
+      --canvas-background: #1B1B1B;
+      --canvas-shadow: #000000;
+      --upcoming-background: #333333;
+      --button-background: #333333;
+    }
+    #tetris   { position: relative; margin: 1em auto; padding: 1em; border: 4px solid var(--border-color); border-radius: 10px; background-color: var(--panel-background); }
     #stats    { display: inline-block; vertical-align: top; }
-    #canvas   { display: inline-block; vertical-align: top; background: url(texture.jpg); box-shadow: 10px 10px 10px #999; border: 2px solid #333; }
+    #canvas   { display: inline-block; vertical-align: top; background: var(--canvas-background); box-shadow: 10px 10px 10px var(--canvas-shadow); border: 2px solid var(--border-color); }
     #menu     { display: inline-block; vertical-align: top; position: relative; }
-    #menu p   { margin: 0.5em 0; text-align: center; }
-    #menu p a { text-decoration: none; color: black; }
-    #upcoming { display: block; margin: 0 auto; background-color: #E0E0E0; }
+    #menu p   { margin: 0.5em 0; text-align: center; color: var(--text-color); }
+    #menu p a { text-decoration: none; color: var(--text-color); }
+    #upcoming { display: block; margin: 0 auto; background-color: var(--upcoming-background); }
+    #theme-toggle { position: absolute; top: 0.5em; right: 0.5em; border: 1px solid var(--border-color); border-radius: 50%; background: var(--button-background); color: var(--text-color); cursor: pointer; font-size: 1em; line-height: 1; padding: 0.3em; }
     #score    { color: blue; font-weight: bold; vertical-align: middle; }
     #rows     { color: blue; font-weight: bold; vertical-align: middle; }
+    #court    { display: inline-block; vertical-align: top; position: relative; }
+    #msg      { position: absolute; top: 45%; left: 50%; width: 100%; text-align: center; font-size: 1.4em; font-weight: bold; pointer-events: none; opacity: 0; z-index: 10; text-shadow: 2px 2px 4px #000; }
+    #msg.bem      { color: #2ecc71; }
+    #msg.parabens { color: #f39c12; }
+    #msg.perfeito { color: #f1c40f; }
+    #msg.meta     { color: #e74c3c; font-size: 1.5em; }
+    #msg.animar      { animation: aparecer 1.6s ease-out forwards; }
+    #msg.meta.animar { animation: aparecer 2.2s ease-out forwards, brilho 0.3s ease-in-out 6 alternate; }
+    #canvas.piscar   { animation: piscar 0.4s ease-out; }
+
+    @keyframes aparecer {
+      0%   { opacity: 0; transform: translate(-50%, -50%) scale(0.2) rotate(-10deg); }
+      15%  { opacity: 1; transform: translate(-50%, -50%) scale(1.25) rotate(3deg); }
+      25%  { transform: translate(-50%, -50%) scale(1) rotate(0deg); }
+      75%  { opacity: 1; transform: translate(-50%, -50%) scale(1); }
+      100% { opacity: 0; transform: translate(-50%, -180%) scale(0.8); }
+    }
+    @keyframes brilho {
+      from { box-shadow: 0 0 5px 2px gold; }
+      to   { box-shadow: 0 0 30px 10px gold; }
+    }
+    @keyframes piscar {
+      0%   { box-shadow: 0 0 30px 8px #FFF; }
+      100% { box-shadow: 10px 10px 10px var(--canvas-shadow); }
+    }
     #stats    { position: absolute; bottom: 0em; right: 1em; }
+    #high-score {
+      color:green; font-weight: bold; vertical-align: middle;
+    }
     @media screen and (min-width:   0px) and (min-height:   0px)  { #tetris { font-size: 0.75em; width: 250px; } #menu { width: 100px; height: 200px; } #upcoming { width:  50px; height:  50px; } #canvas { width: 100px; height: 200px; } } /* 10px chunks */
     @media screen and (min-width: 400px) and (min-height: 400px)  { #tetris { font-size: 1.00em; width: 350px; } #menu { width: 150px; height: 300px; } #upcoming { width:  75px; height:  75px; } #canvas { width: 150px; height: 300px; } } /* 15px chunks */
     @media screen and (min-width: 500px) and (min-height: 500px)  { #tetris { font-size: 1.25em; width: 450px; } #menu { width: 200px; height: 400px; } #upcoming { width: 100px; height: 100px; } #canvas { width: 200px; height: 400px; } } /* 20px chunks */
@@ -27,15 +78,21 @@
 <body>
 
   <div id="tetris">
+    <button id="theme-toggle" type="button" aria-label="Ativar modo noturno">&#9790;</button>
     <div id="menu">
       <p id="start"><a href="javascript:play();">Press Space to Play.</a></p>
       <p><canvas id="upcoming"></canvas></p>
       <p>score <span id="score">00000</span></p>
+      <p>score record <span id="high-score">00000</span></p>
       <p>rows <span id="rows">0</span></p>
+      <p>meta <span id="meta">5</span></p>
+    </div>
+    <div id="court">
+      <canvas id="canvas">
+        Sorry, this example cannot be run because your browser does not support the &lt;canvas&gt; element
+      </canvas>
+      <div id="msg"></div>
     </div>
-    <canvas id="canvas">
-      Sorry, this example cannot be run because your browser does not support the &lt;canvas&gt; element
-    </canvas>
   </div>
 
   <script src="stats.js"></script>
@@ -68,7 +125,7 @@
     // game constants
     //-------------------------------------------------------------------------
 
-    var KEY     = { ESC: 27, SPACE: 32, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40 },
+    var KEY     = { ESC: 27, SPACE: 32, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40, R: 82 },
         DIR     = { UP: 0, RIGHT: 1, DOWN: 2, LEFT: 3, MIN: 0, MAX: 3 },
         stats   = new Stats(),
         canvas  = get('canvas'),
@@ -97,6 +154,14 @@
         rows,          // number of completed rows in the current game
         step;          // how long before current piece drops by 1 row
 
+    var highScore = Number(localStorage.getItem('highScore')) || 0;
+    var darkMode = false;
+
+    // mensagens que aparecem quando completa linha
+    var mensagens = ['Muito bem!', 'Parabéns!', 'Perfeito!'];
+    var tipos     = ['bem', 'parabens', 'perfeito'];
+    var meta = 5;
+
     //-------------------------------------------------------------------------
     // tetris pieces
     //
@@ -197,9 +262,19 @@
       get('menu').appendChild(stats.domElement);
     }
 
+    function toggleTheme() {
+      darkMode = !darkMode;
+      document.body.classList.toggle('dark-mode', darkMode);
+      html('theme-toggle', darkMode ? '&#9728;' : '&#9790;');
+      get('theme-toggle').setAttribute('aria-label', darkMode ? 'Desativar modo noturno' : 'Ativar modo noturno');
+      invalidate();
+      invalidateNext();
+    }
+
     function addEvents() {
       document.addEventListener('keydown', keydown, false);
       window.addEventListener('resize', resize, false);
+      get('theme-toggle').addEventListener('click', toggleTheme, false);
     }
 
     function resize(event) {
@@ -214,29 +289,63 @@
     }
 
     function keydown(ev) {
-      var handled = false;
-      if (playing) {
-        switch(ev.keyCode) {
-          case KEY.LEFT:   actions.push(DIR.LEFT);  handled = true; break;
-          case KEY.RIGHT:  actions.push(DIR.RIGHT); handled = true; break;
-          case KEY.UP:     actions.push(DIR.UP);    handled = true; break;
-          case KEY.DOWN:   actions.push(DIR.DOWN);  handled = true; break;
-          case KEY.ESC:    lose();                  handled = true; break;
-          case KEY.SPACE:  pause();                 handled = true; break;
+        var handled = false;
+
+        if (document.activeElement &&
+          (document.activeElement.tagName === 'INPUT' ||
+            document.activeElement.tagName === 'TEXTAREA' ||
+            document.activeElement.isContentEditable)) {
+          return;
         }
-      }
-      else if (ev.keyCode == KEY.SPACE) {
-        if(paused) {
+
+        if (ev.keyCode == KEY.LEFT || ev.keyCode == KEY.RIGHT || ev.keyCode == KEY.UP || ev.keyCode == KEY.DOWN) {
+          if (!paused) {
+            switch (ev.keyCode) {
+              case KEY.LEFT: actions.push(DIR.LEFT); handled = true; break;
+              case KEY.RIGHT: actions.push(DIR.RIGHT); handled = true; break;
+              case KEY.UP: actions.push(DIR.UP); handled = true; break;
+              case KEY.DOWN: actions.push(DIR.DOWN); handled = true; break;
+              case KEY.ESC: lose(); handled = true; break;
+              case KEY.SPACE: pause(); handled = true; break;
+              case KEY.R: requestRestart(); handled = true; break;
+            }
+          }
+        }
+        else if (ev.keyCode == KEY.SPACE) {
+          if (paused) {
             restart();
-            handled = true;
-          }else{
+          } else if (playing) {
+            pause();
+          } else {
             play();
-            handled = true;
           }
+
+          handled = true;
+        }
+        else if (ev.keyCode == KEY.R) {
+          requestRestart();
+          handled = true;
+        }
+
+        if (handled)
+          ev.preventDefault();
+      }
+
+    // Função de Reinicio Rápido do Jogo (Quick-resart)
+    function requestRestart() {
+        if (!playing && !paused) return;
+
+        if (window.confirm('Tem certeza que deseja reiniciar a partida?')) {
+          restartGame();
+        }
+      }
+
+      function restartGame() {
+        reset();
+        hide('start');
+        paused = false;
+        playing = true;
       }
-      if (handled)
-        ev.preventDefault(); // prevent arrow keys from scrolling the page (supported in IE9+ and all other browsers)
-    }
 
     //-------------------------------------------------------------------------
     // GAME LOGIC
@@ -245,7 +354,16 @@
     function play() { hide('start'); reset();      paused = false;  playing = true;  }
     function pause() {show('start'); paused = true; playing = false;}
     function restart() {hide('start'); paused = false; playing = true;}
-    function lose() { show('start'); setVisualScore(); playing = false; }
+    function lose() {
+      if (score > highScore) {
+        highScore = score;
+        localStorage.setItem('highScore', highScore);
+      }
+      drawHighScore();
+      show('start');
+      setVisualScore();
+      playing = false;
+    }
 
     function setVisualScore(n)      { vscore = n || score; invalidateScore(); }
     function setScore(n)            { score = n; setVisualScore(n);  }
@@ -267,6 +385,8 @@
       clearBlocks();
       clearRows();
       clearScore();
+      setMeta(5);
+      get('msg').className = '';
       setCurrentPiece(next);
       setNextPiece();
     }
@@ -356,9 +476,31 @@
       if (n > 0) {
         addRows(n);
         addScore(100*Math.pow(2,n-1)); // 1: 100, 2: 200, 3: 400, 4: 800
+        if (rows >= meta) {
+          mostrarMensagem('Parabéns!<br>Meta de ' + meta + ' linhas!', 'meta');
+          setMeta(meta + 5);
+        }
+        else {
+          var i = Math.min(n, 3) - 1;
+          mostrarMensagem(mensagens[i], tipos[i]);
+        }
       }
     }
 
+    function setMeta(n) { meta = n; html('meta', meta); }
+
+    function mostrarMensagem(texto, tipo) {
+      var msg = get('msg');
+      msg.innerHTML = texto;
+      msg.className = tipo;
+      void msg.offsetWidth;
+      msg.className = tipo + ' animar';
+
+      canvas.classList.remove('piscar');
+      void canvas.offsetWidth;
+      canvas.classList.add('piscar');
+    }
+
     function removeLine(n) {
       var x, y;
       for(y = n ; y >= 0 ; --y) {
@@ -401,6 +543,7 @@
               drawBlock(ctx, x, y, block.color);
           }
         }
+        ctx.strokeStyle = darkMode ? '#F5F5F5' : '#000000';
         ctx.strokeRect(0, 0, nx*dx - 1, ny*dy - 1); // court boundary
         invalid.court = false;
       }
@@ -413,7 +556,7 @@
         uctx.translate(0.5, 0.5);
         uctx.clearRect(0, 0, nu*dx, nu*dy);
         drawPiece(uctx, next.type, padding, padding, next.dir);
-        uctx.strokeStyle = 'black';
+        uctx.strokeStyle = darkMode ? '#F5F5F5' : '#000000';
         uctx.strokeRect(0, 0, nu*dx - 1, nu*dy - 1);
         uctx.restore();
         invalid.next = false;
@@ -433,6 +576,9 @@
         invalid.rows = false;
       }
     }
+    function drawHighScore() {
+      html('high-score', ("00000" + highScore).slice(-5));
+    }
 
     function drawPiece(ctx, type, x, y, dir) {
       eachblock(type, x, y, dir, function(x, y) {
@@ -450,6 +596,7 @@
     // FINALLY, lets run the game
     //-------------------------------------------------------------------------
 
+    drawHighScore();
     run();
 
   </script>