diff --git a/gulpfile.js b/gulpfile.js
index 356f31ad6..a99782262 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -150,7 +150,7 @@ const refactoredSrc = [
   "./src/js/test/manual-restart-tracker.js",
   "./src/js/test/test-stats.js",
   "./src/js/test/focus.js",
-  "./src/js/test/practise-missed.js",
+  "./src/js/test/practise-words.js",
   "./src/js/test/test-ui.js",
   "./src/js/test/keymap.js",
   "./src/js/test/live-wpm.js",
diff --git a/src/js/commandline-lists.js b/src/js/commandline-lists.js
index 46a32a744..14b299e6c 100644
--- a/src/js/commandline-lists.js
+++ b/src/js/commandline-lists.js
@@ -8,7 +8,7 @@ import * as ThemeController from "./theme-controller";
 import * as CustomTextPopup from "./custom-text-popup";
 import * as ManualRestart from "./manual-restart-tracker";
 import Config, * as UpdateConfig from "./config";
-import * as PractiseMissed from "./practise-missed";
+import * as PractiseWords from "./practise-words";
 import * as TestUI from "./test-ui";
 import * as TestLogic from "./test-logic";
 import * as Funbox from "./funbox";
@@ -2082,6 +2082,36 @@ let commandsPageWidth = {
   ],
 };
 
+let commandsPractiseWords = {
+  title: "Practice words...",
+  list: [
+    {
+      id: "practiseWordsMissed",
+      display: "missed",
+      noIcon: true,
+      exec: () => {
+        PractiseWords.init(true, false);
+      },
+    },
+    {
+      id: "practiseWordsSlow",
+      display: "slow",
+      noIcon: true,
+      exec: () => {
+        PractiseWords.init(false, true);
+      },
+    },
+    {
+      id: "practiseWordsBoth",
+      display: "both",
+      noIcon: true,
+      exec: () => {
+        PractiseWords.init(true, true);
+      },
+    },
+  ],
+};
+
 export let themeCommands = {
   title: "Theme...",
   configKey: "theme",
@@ -2764,16 +2794,12 @@ export let defaultCommands = {
       },
     },
     {
-      id: "practiceMissedWords",
-      display: "Practice missed words",
+      id: "practiseWords",
+      display: "Practice words...",
       icon: "fa-exclamation-triangle",
-      exec: () => {
-        PractiseMissed.init();
-      },
+      subgroup: commandsPractiseWords,
       available: () => {
-        return (
-          TestUI.resultVisible && Object.keys(TestStats.missedWords).length > 0
-        );
+        return TestUI.resultVisible;
       },
     },
     {
diff --git a/src/js/config.js b/src/js/config.js
index 4403e09fb..46e4dcd57 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -1554,8 +1554,10 @@ export function setBurstHeatmap(value, nosave) {
     value = false;
   }
   config.burstHeatmap = value;
-  TestUI.applyBurstHeatmap();
-  if (!nosave) saveToLocalStorage();
+  if (!nosave) {
+    TestUI.applyBurstHeatmap();
+    saveToLocalStorage();
+  }
 }
 
 export function apply(configObj) {
diff --git a/src/js/test/practise-missed.js b/src/js/test/practise-missed.js
deleted file mode 100644
index 80fc9790c..000000000
--- a/src/js/test/practise-missed.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as TestStats from "./test-stats";
-import * as Notifications from "./notifications";
-import Config, * as UpdateConfig from "./config";
-import * as CustomText from "./custom-text";
-import * as TestLogic from "./test-logic";
-
-export let before = {
-  mode: null,
-  punctuation: null,
-  numbers: null,
-};
-
-export function init() {
-  if (Object.keys(TestStats.missedWords).length == 0) {
-    Notifications.add("You haven't missed any words.", 0);
-    return;
-  }
-  let mode = before.mode === null ? Config.mode : before.mode;
-  let punctuation =
-    before.punctuation === null ? Config.punctuation : before.punctuation;
-  let numbers = before.numbers === null ? Config.numbers : before.numbers;
-  UpdateConfig.setMode("custom");
-  let newCustomText = [];
-  Object.keys(TestStats.missedWords).forEach((missedWord) => {
-    for (let i = 0; i < TestStats.missedWords[missedWord]; i++) {
-      newCustomText.push(missedWord);
-    }
-  });
-  CustomText.setText(newCustomText);
-  CustomText.setIsWordRandom(true);
-  CustomText.setWord(Object.keys(TestStats.missedWords).length * 5);
-
-  TestLogic.restart(false, false, false, true);
-  before.mode = mode;
-  before.punctuation = punctuation;
-  before.numbers = numbers;
-}
-
-export function resetBefore() {
-  before.mode = null;
-  before.punctuation = null;
-  before.numbers = null;
-}
diff --git a/src/js/test/practise-words.js b/src/js/test/practise-words.js
new file mode 100644
index 000000000..fe7d21ad5
--- /dev/null
+++ b/src/js/test/practise-words.js
@@ -0,0 +1,139 @@
+import * as TestStats from "./test-stats";
+import * as Notifications from "./notifications";
+import Config, * as UpdateConfig from "./config";
+import * as CustomText from "./custom-text";
+import * as TestLogic from "./test-logic";
+
+export let before = {
+  mode: null,
+  punctuation: null,
+  numbers: null,
+};
+
+export function init(missed, slow) {
+  let limit;
+  if ((missed && !slow) || (!missed && slow)) {
+    limit = 20;
+  } else if (missed && slow) {
+    limit = 10;
+  }
+
+  let sortableMissedWords = [];
+  if (missed) {
+    Object.keys(TestStats.missedWords).forEach((missedWord) => {
+      sortableMissedWords.push([missedWord, TestStats.missedWords[missedWord]]);
+    });
+    sortableMissedWords.sort((a, b) => {
+      return b[1] - a[1];
+    });
+    sortableMissedWords = sortableMissedWords.slice(0, limit);
+  }
+
+  if (missed && !slow && sortableMissedWords.length == 0) {
+    Notifications.add("You haven't missed any words", 0);
+    return;
+  }
+
+  let sortableSlowWords = [];
+  if (slow) {
+    sortableSlowWords = TestLogic.words.get().map(function (e, i) {
+      return [e, TestStats.burstHistory[i]];
+    });
+    sortableSlowWords.sort((a, b) => {
+      return a[1] - b[1];
+    });
+    sortableSlowWords = sortableSlowWords.slice(
+      0,
+      Math.min(limit, Math.round(TestLogic.words.length * 0.2))
+    );
+  }
+
+  // console.log(sortableMissedWords);
+  // console.log(sortableSlowWords);
+
+  let newCustomText = [];
+  sortableMissedWords.forEach((missed, index) => {
+    for (let i = 0; i < missed[1]; i++) {
+      newCustomText.push(missed[0]);
+    }
+  });
+
+  sortableSlowWords.forEach((slow, index) => {
+    for (let i = 0; i < sortableSlowWords.length - index; i++) {
+      newCustomText.push(slow[0]);
+    }
+  });
+
+  // console.log(newCustomText);
+
+  let mode = before.mode === null ? Config.mode : before.mode;
+  let punctuation =
+    before.punctuation === null ? Config.punctuation : before.punctuation;
+  let numbers = before.numbers === null ? Config.numbers : before.numbers;
+  UpdateConfig.setMode("custom");
+
+  CustomText.setText(newCustomText);
+  CustomText.setIsWordRandom(true);
+  CustomText.setWord(
+    (sortableSlowWords.length + sortableMissedWords.length) * 5
+  );
+
+  TestLogic.restart(false, false, false, true);
+  before.mode = mode;
+  before.punctuation = punctuation;
+  before.numbers = numbers;
+}
+
+export function resetBefore() {
+  before.mode = null;
+  before.punctuation = null;
+  before.numbers = null;
+}
+
+export function showPopup() {
+  if ($("#practiseWordsPopupWrapper").hasClass("hidden")) {
+    $("#practiseWordsPopupWrapper")
+      .stop(true, true)
+      .css("opacity", 0)
+      .removeClass("hidden")
+      .animate({ opacity: 1 }, 100);
+  }
+}
+
+function hidePopup() {
+  if (!$("#practiseWordsPopupWrapper").hasClass("hidden")) {
+    $("#practiseWordsPopupWrapper")
+      .stop(true, true)
+      .css("opacity", 1)
+      .animate(
+        {
+          opacity: 0,
+        },
+        100,
+        (e) => {
+          $("#practiseWordsPopupWrapper").addClass("hidden");
+        }
+      );
+  }
+}
+
+$("#practiseWordsPopupWrapper").click((e) => {
+  if ($(e.target).attr("id") === "practiseWordsPopupWrapper") {
+    hidePopup();
+  }
+});
+
+$("#practiseWordsPopup .button.missed").click(() => {
+  hidePopup();
+  init(true, false);
+});
+
+$("#practiseWordsPopup .button.slow").click(() => {
+  hidePopup();
+  init(false, true);
+});
+
+$("#practiseWordsPopup .button.both").click(() => {
+  hidePopup();
+  init(true, true);
+});
diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 54dc52ee9..ccd42a92a 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -5,7 +5,7 @@ import * as Misc from "./misc";
 import * as Notifications from "./notifications";
 import * as CustomText from "./custom-text";
 import * as TestStats from "./test-stats";
-import * as PractiseMissed from "./practise-missed";
+import * as PractiseWords from "./practise-words";
 import * as ShiftTracker from "./shift-tracker";
 import * as Focus from "./focus";
 import * as Funbox from "./funbox";
@@ -529,7 +529,7 @@ export async function init() {
           randomWord = CustomText.text[i];
         } else if (
           Config.mode == "custom" &&
-          (wordset.length < 3 || PractiseMissed.before.mode !== null)
+          (wordset.length < 3 || PractiseWords.before.mode !== null)
         ) {
           randomWord = wordset[Math.floor(Math.random() * wordset.length)];
         } else {
@@ -775,15 +775,15 @@ export function restart(
   }
 
   if (
-    PractiseMissed.before.mode !== null &&
+    PractiseWords.before.mode !== null &&
     !withSameWordset &&
     !practiseMissed
   ) {
     Notifications.add("Reverting to previous settings.", 0);
-    UpdateConfig.setMode(PractiseMissed.before.mode);
-    UpdateConfig.setPunctuation(PractiseMissed.before.punctuation);
-    UpdateConfig.setNumbers(PractiseMissed.before.numbers);
-    PractiseMissed.resetBefore();
+    UpdateConfig.setMode(PractiseWords.before.mode);
+    UpdateConfig.setPunctuation(PractiseWords.before.punctuation);
+    UpdateConfig.setNumbers(PractiseWords.before.numbers);
+    PractiseWords.resetBefore();
   }
 
   let repeatWithPace = false;
diff --git a/src/js/test/test-ui.js b/src/js/test/test-ui.js
index 8c72ee4de..a4c68f817 100644
--- a/src/js/test/test-ui.js
+++ b/src/js/test/test-ui.js
@@ -12,7 +12,7 @@ import * as CommandlineLists from "./commandline-lists";
 import * as Commandline from "./commandline";
 import * as OutOfFocus from "./out-of-focus";
 import * as ManualRestart from "./manual-restart-tracker";
-import * as PractiseMissed from "./practise-missed";
+import * as PractiseWords from "./practise-words";
 import * as Replay from "./replay";
 import * as TestStats from "./test-stats";
 import * as Misc from "./misc";
@@ -796,6 +796,16 @@ export function applyBurstHeatmap() {
     $("#resultWordsHistory .heatmapLegend").removeClass("hidden");
     let min = Math.min(...TestStats.burstHistory);
     let max = Math.max(...TestStats.burstHistory);
+
+    let burstlist = TestStats.burstHistory;
+
+    if (
+      TestLogic.input.getHistory(TestLogic.input.getHistory().length - 1)
+        .length !== TestLogic.words.getCurrent().length
+    ) {
+      burstlist = burstlist.splice(0, burstlist.length - 1);
+    }
+
     // let step = (max - min) / 5;
     // let steps = [
     //   {
@@ -819,13 +829,13 @@ export function applyBurstHeatmap() {
     //     class: 'heatmap-4'
     //   },
     // ];
-    let median = Misc.median(TestStats.burstHistory);
+    let median = Misc.median(burstlist);
     let adatm = [];
-    TestStats.burstHistory.forEach((burst) => {
+    burstlist.forEach((burst) => {
       adatm.push(Math.abs(median - burst));
     });
     let step = Misc.mean(adatm);
-    // let step = Misc.stdDev(TestStats.burstHistory)/2;
+    // let step = Misc.stdDev(burstlist)/2;
     let steps = [
       {
         val: 0,
@@ -994,14 +1004,16 @@ $(document.body).on("click", "#restartTestButton", () => {
   }
 });
 
-$(document).on("keypress", "#practiseMissedWordsButton", (event) => {
-  if (event.keyCode == 13) {
-    PractiseMissed.init();
-  }
+$(document).on("keypress", "#practiseWordsButton", (event) => {
+  // if (event.keyCode == 13) {
+  //   PractiseWords.init();
+  // }
+  PractiseWords.showPopup();
 });
 
-$(document.body).on("click", "#practiseMissedWordsButton", () => {
-  PractiseMissed.init();
+$(document.body).on("click", "#practiseWordsButton", () => {
+  // PractiseWords.init();
+  PractiseWords.showPopup();
 });
 
 $(document).on("keypress", "#nextTestButton", (event) => {
diff --git a/src/sass/style.scss b/src/sass/style.scss
index ca3af016a..ab515160b 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -714,7 +714,8 @@ label.checkbox {
 }
 
 #customWordAmountPopupWrapper,
-#customTestDurationPopupWrapper {
+#customTestDurationPopupWrapper,
+#practiseWordsPopupWrapper {
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.75);
@@ -728,7 +729,8 @@ label.checkbox {
   padding: 5rem 0;
 
   #customWordAmountPopup,
-  #customTestDurationPopup {
+  #customTestDurationPopup,
+  #practiseWordsPopup {
     background: var(--bg-color);
     border-radius: var(--roundness);
     padding: 2rem;
@@ -745,6 +747,11 @@ label.checkbox {
       font-size: 0.75rem;
       color: var(--sub-color);
     }
+
+    .text {
+      font-size: 1rem;
+      color: var(--text-color);
+    }
   }
 
   #customTestDurationPopup {
@@ -2381,7 +2388,7 @@ key {
 #saveScreenshotButton,
 #restartTestButtonWithSameWordset,
 #nextTestButton,
-#practiseMissedWordsButton,
+#practiseWordsButton,
 #watchReplayButton {
   position: relative;
   border-radius: var(--roundness);
diff --git a/static/index.html b/static/index.html
index 81de5f076..ef02c277e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -126,6 +126,20 @@
       <div id="simplePopup" popupId=""></div>
     </div>
 
+    <div id="practiseWordsPopupWrapper" class="hidden">
+      <div id="practiseWordsPopup" action="">
+        <div class="title">Practice words</div>
+        <div class="text">
+          This will start a new test in custom mode. Words that you mistyped
+          more often or words that you typed much slower will be weighted higher
+          and appear more often.
+        </div>
+        <div class="button missed">Practice missed</div>
+        <div class="button slow">Practice slow</div>
+        <div class="button both">Practice both</div>
+      </div>
+    </div>
+
     <div id="settingsImportWrapper" class="hidden">
       <div id="settingsImport" action="">
         <input type="text" />
@@ -1515,8 +1529,8 @@
                   <i class="fas fa-fw fa-sync-alt"></i>
                 </div>
                 <div
-                  id="practiseMissedWordsButton"
-                  aria-label="Practise missed words"
+                  id="practiseWordsButton"
+                  aria-label="Practice words"
                   data-balloon-pos="down"
                   tabindex="0"
                   onclick="this.blur();"
diff --git a/static/quotes/english.json b/static/quotes/english.json
index 3a2885b92..306703c21 100644
--- a/static/quotes/english.json
+++ b/static/quotes/english.json
@@ -33256,6 +33256,360 @@
       "source": "Friedrich Nietzsche",
       "length": 46,
       "id": 5610
+    },
+    {
+      "text": "There is nothing. Only warm, primordial blackness. Your conscience ferments in it, no larger than a single grain of malt.",
+      "source": "Disco Elysium",
+      "length": 122,
+      "id": 5611
+    },
+    {
+      "text": "Time without purpose is a prison. I have glimpsed into the mind of eternity, perhaps the mind of God, and found nothing but silence. I think we should just be friends.",
+      "source": "Jessica, Rick and Morty Season 5 Episode 1",
+      "length": 167,
+      "id": 5612
+    },
+    {
+      "text": "Now I am become Death, the destroyer of worlds.",
+      "source": "J. Robert Oppenheimer",
+      "length": 47,
+      "id": 5613
+    },
+    {
+      "text": "The believers, in their mutual love, compassion, and sympathy are like a single body; if one of its organs suffers, the whole body will respond to it with sleeplessness and fever.",
+      "source": "Prophet Mohammed (PBUH)",
+      "length": 179,
+      "id": 5614
+    },
+    {
+      "text": "Many people were increasingly of the opinion that they'd all made a big mistake in coming down from the trees in the first place. And some said that even the trees had been a bad move, and that no one should ever have left the oceans to begin with.",
+      "source": "Hitchhiker's Guide to the Galaxy",
+      "length": 248,
+      "id": 5615
+    },
+    {
+      "text": "We are all just prisoners here, of our own device.",
+      "source": "Hotel California - The Eagles",
+      "length": 50,
+      "id": 5616
+    },
+    {
+      "text": "If you get news of the outbreak of a plague in a land, do not enter it, and if it breaks out in a land in which you are, do not leave it.",
+      "source": "Prophet Mohammed (PBUH)",
+      "length": 137,
+      "id": 5617
+    },
+    {
+      "text": "I can't erase all the things that I've done but all the mistakes made me who I've become.",
+      "source": "Fletcher, Healing",
+      "length": 89,
+      "id": 5618
+    },
+    {
+      "text": "The life of this world is made up of three days: yesterday has gone with all that was done; tomorrow, you may never reach; but today is for you so do what you should do today.",
+      "source": "Hasan Al-Basri",
+      "length": 175,
+      "id": 5619
+    },
+    {
+      "text": "One generation sows, the next shall reap. But laugh not too soon or praises heap. Beware the reapers who behind you creep.",
+      "source": "Liu Xie, Romance Of The Three Kingdoms",
+      "length": 122,
+      "id": 5620
+    },
+    {
+      "text": "The most exciting phrase to hear in science, the one that heralds the most discoveries, is not \"Eureka!\" (I found it!) but 'That's funny...'",
+      "source": "Isaac Asimov",
+      "length": 140,
+      "id": 5621
+    },
+    {
+      "text": "He, who is possessed of plenty, and is miserly with his great wealth toward his people, will be dispensed with, and abused. He who keeps his word, will not be reviled; and he whose heart is guided to self-satisfying benevolence will not stammer.",
+      "source": "Zuhair Ibn Abi Sulma, Hanging Odes",
+      "length": 245,
+      "id": 5622
+    },
+    {
+      "text": "In the shooter hypothesis, a good marksman shoots at a target, creating a hole every ten centimeters. Now suppose the surface of the target is inhabited by intelligent, two-dimensional creatures. Their scientists, after observing the universe, discover a great law: \"There exists a hole in the universe every ten centimeters.\" They have mistaken the result of the marksman's momentary whim for an unalterable law of the universe. The farmer hypothesis, on the other hand, has the flavor of a horror story: Every morning on a turkey farm, the farmer comes to feed the turkeys. A scientist turkey, having observed this pattern to hold without change for almost a year, makes the following discovery: \"Every morning at eleven, food arrives.\" On the morning of Thanksgiving, the scientist announces this law to the other turkeys. But that morning at eleven, food doesn't arrive; instead, the farmer comes and kills the entire flock.",
+      "source": "The Three-Body Problem",
+      "length": 928,
+      "id": 5623
+    },
+    {
+      "text": "Don't worry about the world coming to an end today. It's already tomorrow in Australia.",
+      "source": "Charles M. Schulz",
+      "length": 87,
+      "id": 5624
+    },
+    {
+      "text": "God put me on this earth to accomplish a certain number of things. Right now I am so far behind that I will never die.",
+      "source": "Bill Watterson",
+      "length": 118,
+      "id": 5625
+    },
+    {
+      "text": "This is a valley of ashes; a fantastic farm where ashes grow like wheat into ridges and hills and grotesque gardens; where ashes take the forms of houses and chimneys and rising smoke and, finally, with a transcendent effort, of men who move dimly and already crumbling through the powdery air.",
+      "source": "The Great Gatsby, F. Scott Fitzgerald",
+      "length": 294,
+      "id": 5626
+    },
+    {
+      "text": "The rain feels very cold. You look down as the men carry the body past you. You realise you have been holding Peggy's letter in your left hand the whole time. The ink is hopelessly blurred. You crumple it into a ball and drop it into the mud and begin to walk back to your tent.",
+      "source": "Charles Coe, Young Man in Vietnam",
+      "length": 278,
+      "id": 5627
+    },
+    {
+      "text": "And as I watch the drops of rain weave their weary paths and die, I know that I am like the rain: there but for the grace of you go I.",
+      "source": "Kathy's Song",
+      "length": 134,
+      "id": 5628
+    },
+    {
+      "text": "He died doing what he wanted, no matter what, right? I bet he was happy.",
+      "source": "Guts, Berserk, Kentaro Miura",
+      "length": 72,
+      "id": 5629
+    },
+    {
+      "text": "If you want to be happy, do not dwell in the past, do not worry about the future, focus on living fully in the present.",
+      "source": "Roy T. Bennett",
+      "length": 119,
+      "id": 5630
+    },
+    {
+      "text": "Human suffering anywhere concerns men and women everywhere.",
+      "source": "Night, Elie Wiesel",
+      "length": 59,
+      "id": 5631
+    },
+    {
+      "text": "Music is a science that would have us laugh, sing, and dance.",
+      "source": "Guillaume de Machaut, \"The Fountain of Love\"",
+      "length": 61,
+      "id": 5632
+    },
+    {
+      "text": "New Crystal Gems! Congregate! That means come over here and do a cool pose.",
+      "source": "Rebecca sugar",
+      "length": 75,
+      "id": 5633
+    },
+    {
+      "text": "I'm sick of following my dreams. I'm just going to ask them where they're going and hook up with them later.",
+      "source": "Mitch Hedberg",
+      "length": 108,
+      "id": 5634
+    },
+    {
+      "text": "Know what I pray for? The strength to change what I can, the inability to accept what I can't, and the incapacity to tell the difference.",
+      "source": "Calvin & Hobbes",
+      "length": 137,
+      "id": 5635
+    },
+    {
+      "text": "But we must not follow those who advise us, being men, to think of human things, and, being mortal, of mortal things, but must, so far as we can, make ourselves immortal, and strain every nerve to live in accordance with the best thing in us; for even if it be small in bulk, much more does it in power and worth surpass everything.",
+      "source": "Nicomachean Ethics, W.D. Ross translation",
+      "length": 332,
+      "id": 5636
+    },
+    {
+      "text": "Rather than love, than money, than fame, give me truth.",
+      "source": "Walden",
+      "length": 55,
+      "id": 5637
+    },
+    {
+      "text": "You are not a drop in the ocean. You are the entire ocean in a drop.",
+      "source": "Rumi",
+      "length": 68,
+      "id": 5638
+    },
+    {
+      "text": "There is nothing more deceptive than an obvious fact.",
+      "source": "Arthur Conan Doyle, The Boscombe Valley Mystery",
+      "length": 53,
+      "id": 5639
+    },
+    {
+      "text": "Where are you? And I'm so sorry, I cannot sleep I cannot dream tonight.",
+      "source": "Blink-182, I Miss You",
+      "length": 71,
+      "id": 5640
+    },
+    {
+      "text": "There is matter to everything even air or shadow, too small to see. The Cut is something a Summoner can do, but it requires tremendous skill and I would only use it as a last resort. Like that ambush.",
+      "source": "Shadow and Bone",
+      "length": 200,
+      "id": 5641
+    },
+    {
+      "text": "I have squandered my resistance for a pocketful of mumbles, such are promises.",
+      "source": "The Boxer",
+      "length": 78,
+      "id": 5642
+    },
+    {
+      "text": "I want to enjoy not getting recognized while it lasts. But the mask is a symbol of unity. Anyone can be a Walker.",
+      "source": "Alan Walker",
+      "length": 113,
+      "id": 5643
+    },
+    {
+      "text": "Such a person must be careful, he must be aware of the limitations of his knowledge, he must acknowledge his personal prejudices because he is being asked to speak for a whole realm of thought, he must be aware of the huge possible consequences of what he says and writes and does. He has become, in a sense, public property because he represents something large to the public. He has become an idea himself, a human striving. He has enormous power to influence and change, and he must wield that power with respect.",
+      "source": "Alan Lightman, The Role of the Public Intellectual",
+      "length": 516,
+      "id": 5644
+    },
+    {
+      "text": "If we could change ourselves, the tendencies in the world would also change. As a man changes his own nature, so does the attitude of the world change towards him. We need not wait to see what others do.",
+      "source": "Mahatma Gandhi",
+      "length": 203,
+      "id": 5645
+    },
+    {
+      "text": "Some dance to remember, some dance to forget.",
+      "source": "Hotel California",
+      "length": 45,
+      "id": 5646
+    },
+    {
+      "text": "The night sky over the planet Krikkit is the least interesting sight in the entire Universe.",
+      "source": "Life, The Universe, and Everything",
+      "length": 93,
+      "id": 5647
+    },
+    {
+      "text": "My capacity for happiness, you could fit into a matchbox without taking out the matches first.",
+      "source": "Marvin; Life, The Universe, and Everything",
+      "length": 94,
+      "id": 5648
+    },
+    {
+      "text": "And every time I've held a rose, it seems I only felt the thorns.",
+      "source": "And So It Goes",
+      "length": 65,
+      "id": 5649
+    },
+    {
+      "text": "The dead man resists, upon which the other kills him by means of the chloroform which he had with him, and being afraid that the cab will stop, and he will be found out, snatches what he wants out of the pocket so quickly that he tears the waistcoat, and then makes off. That's clear enough, but the question is, What was it he wanted? A case with jewels? No! It could not have been anything so bulky, or the dead man would never have carried it about inside his waistcoat. It was something flat, which could easily lie in the pocket - a paper - some valuable paper which the assassin wanted, and for which he killed the other.",
+      "source": "Mystery of a Hansom Cab, Fergus Hume",
+      "length": 627,
+      "id": 5650
+    },
+    {
+      "text": "When we hear any other speaker, even a very good one, he produces absolutely no effect upon us, or not much, whereas the mere fragments of you and your words, even at second-hand, and however imperfectly repeated, amaze and possess the souls of every man, woman, and child who comes within hearing of them. And if I were not afraid that you would think me hopelessly drunk, I would have sworn as well as spoken to the influence which they have always had and still have over me. For my heart leaps within me more than that of any Corybantian reveller, and my eyes rain tears when I hear them.",
+      "source": "The Symposium",
+      "length": 592,
+      "id": 5651
+    },
+    {
+      "text": "You bear witness to the end of your journey. It is not always a happy thing.",
+      "source": "Skull Knight, Berserk, Kentaro Miura",
+      "length": 76,
+      "id": 5652
+    },
+    {
+      "text": "Farewell. We will likely meet again, should destiny dictate. If you mean to pursue the inhumans, follow the guidance of that brand. It reacts strongly to evil. But mind this: Yours is a black path through the night. When you confront those who lurk in the darkness, you also envelop yourself in it. Good journey, struggler.",
+      "source": "Skull Knight, Berserk, Kentaro Miura",
+      "length": 323,
+      "id": 5653
+    },
+    {
+      "text": "Everybody is a genius, but if you judge a fish by its ability to climb a tree, it will live its whole life thinking it's stupid.",
+      "source": "Einstein",
+      "length": 127,
+      "id": 5654
+    },
+    {
+      "text": "Hello there, the angel from my nightmare, the shadow in the background of the morgue. The unsuspecting victim of darkness in the valley. We can live like Jack and Sally if we want. Where you can always find me, and we'll have Halloween on Christmas. And in the night we'll wish this never ends, we'll wish this never ends.",
+      "source": "Blink-182, I Miss You",
+      "length": 322,
+      "id": 5655
+    },
+    {
+      "text": "If I profane with my unworthiest hand\\nThis holy shrine, the gentle fine is this:\\nMy lips, two blushing pilgrims, ready stand\\nTo smooth that rough touch with a tender kiss.",
+      "source": "Romeo, Romeo and Juliet",
+      "length": 174,
+      "id": 5656
+    },
+    {
+      "text": "The tongue of a man is one half, and the other half is his mind, and here is nothing besides these two, except the shape of the blood and the flesh. And verily, as to the folly of an old man there is no wisdom after it, but the young man after his folly may become wise.",
+      "source": "Zuhair Ibn Abi Sulma, Hanging Odes",
+      "length": 270,
+      "id": 5657
+    },
+    {
+      "text": "To forget the dead would be akin to killing them a second time.",
+      "source": "Night, Elie Wiesel",
+      "length": 63,
+      "id": 5658
+    },
+    {
+      "text": "I pray to the God within me that He will give me the strength to ask Him the right questions.",
+      "source": "Night, Elie Wiesel",
+      "length": 93,
+      "id": 5659
+    },
+    {
+      "text": "You've gotta know what death is to know life.",
+      "source": "Jack Kevorkian",
+      "length": 45,
+      "id": 5660
+    },
+    {
+      "text": "Don't let yesterday take up too much of today.",
+      "source": "Will Roger",
+      "length": 46,
+      "id": 5661
+    },
+    {
+      "text": "Life is a question and how we live it is our answer.",
+      "source": "Gary Keller",
+      "length": 52,
+      "id": 5662
+    },
+    {
+      "text": "There are those who give with joy, and that joy is their reward.",
+      "source": "Kahlil Gibran",
+      "length": 64,
+      "id": 5663
+    },
+    {
+      "text": "With her green hair sticking out the hood of her yellow raincoat, she looked like a punk spokesperson for frozen fish sticks.",
+      "source": "The Ship of the Dead",
+      "length": 125,
+      "id": 5664
+    },
+    {
+      "text": "It is better to live one day as a lion, than a thousand days as a lamb.",
+      "source": "Proverbs",
+      "length": 71,
+      "id": 5665
+    },
+    {
+      "text": "Go forth on your path, as it exists only through your walking.",
+      "source": "Augustine of Hippo",
+      "length": 62,
+      "id": 5667
+    },
+    {
+      "text": "Solitary trees, if they grow at all, grow strong.",
+      "source": "Winston Churchill",
+      "length": 49,
+      "id": 5668
+    },
+    {
+      "text": "Don't tell people your plans. Show them your results.",
+      "source": "Unknown",
+      "length": 53,
+      "id": 5669
+    },
+    {
+      "text": "Time is just a construct, if you allow it to consume you, it will. It will wear you down until you are nothing but dust. You must learn to transcend and rise beyond such linear and limited fabrics of existence and this creature of unknown origin has done exactly that. You can scream all you want but nobody will hear you. You may call him a God but if you could perceive your own reality as he could, you would know there really are no words to describe such a being.",
+      "source": "Unknown",
+      "length": 468,
+      "id": 5670
     }
   ]
 }
diff --git a/static/quotes/filipino.json b/static/quotes/filipino.json
index 683370822..1317ae9bc 100644
--- a/static/quotes/filipino.json
+++ b/static/quotes/filipino.json
@@ -54,6 +54,12 @@
       "source": "Noypi, Bamboo",
       "length": 54,
       "id": 6
+    },
+    {
+      "text": "Kaharap ko sa jeep ang isang ale. Nagrorosaryo, mata niya'y nakapikit. Pumara sa may kumbento \"Sa baba lang po\", sabi ng tsuper, \"kasi may nanghuhuli\". Mura parin nang mura ang ale.",
+      "source": "Banal na Aso Santong Kabayo, Yano",
+      "length": 181,
+      "id": 7
     }
   ]
 }
\ No newline at end of file
diff --git a/static/quotes/malagasy.json b/static/quotes/malagasy.json
new file mode 100644
index 000000000..54bc7b0a0
--- /dev/null
+++ b/static/quotes/malagasy.json
@@ -0,0 +1,41 @@
+{
+  "language": "malagasy",
+  "groups": [
+    [
+      0,
+      100
+    ],
+    [
+      101,
+      300
+    ],
+    [
+      301,
+      600
+    ],
+    [
+      601,
+      9999
+    ]
+  ],
+  "quotes": [
+    {
+      "text": "Aleo very tsikalakalam-bola toy izay very tsikalakalam-pihavanana.",
+      "source": "Ohabolana",
+      "length": 66,
+      "id": 1
+    },
+    {
+      "text": "Ady amin' adala, ka ny handry no miala.",
+      "source": "Ohabolana, Houlder J.A., 1985",
+      "length": 39,
+      "id": 2
+    },
+    {
+      "text": "Mahagaga. F'eto an-tanindrazako aho nefa, tenin'olon-kafa, no takiana mba ho haiko vao mahazo anjara asa. Hamelomako ankohonana.",
+      "source": "Mahagaga by Georges Ramananatena, aka RADO",
+      "length": 128,
+      "id": 3
+    }
+  ]
+}
\ No newline at end of file
diff --git a/static/quotes/portuguese.json b/static/quotes/portuguese.json
index e59a67d46..949cc32da 100644
--- a/static/quotes/portuguese.json
+++ b/static/quotes/portuguese.json
@@ -144,6 +144,90 @@
       "source": "Alan Moore, Watchmen",
       "length": 316,
       "id": 22
+    },
+    {
+      "text": "Eles estavam em frente à grade que cercava o pasto. Enquanto assistiam, um adestrado trabalhava com o árabe, usando uma corda para guiá-lo em círculos e fazer o oito. Atrás deles, o corretor rural olhava para o relógio de pulso, aguardando a decisão.",
+      "source": "Chuck Palahniuk, Invente alguma coisa",
+      "length": 250,
+      "id": 23
+    },
+    {
+      "text": "Letra F, quem não arrisca, não petisca. Alô, é da casa da Francisca? Ela se mudou, casou com um delegado de polícia. Quer o número? Tô fora, risquei da minha lista.",
+      "source": "Gabriel, o Pensador, 2345meia78",
+      "length": 164,
+      "id": 24
+    },
+    {
+      "text": "Vou ligar pra Zulmira, mas nem adianta, ela nunca dá mole pra ninguém. Mas se eu já levei um fora do alfabeto inteiro, quê que tem levar um \"não\" dela também?",
+      "source": "Gabriel, o Pensador, 2345meia78",
+      "length": 158,
+      "id": 25
+    },
+    {
+      "text": "Fim de semana chegando, e o coitado tá no osso mas acaba de encontrar a solução. Coloca um caderninho no bolso, apanha umas fichas e corre para um orelhão. É o seu velho caderninho de telefone com o nome e o número de um monte de mulher. E ele vai ligar pra todas até conseguir chamar uma gata pra sair e dar um rolé.",
+      "source": "Gabriel, o Pensador, 2345meia78",
+      "length": 317,
+      "id": 26
+    },
+    {
+      "text": "Do outro lado da sala de estar, na parte mais estreita da garganta, havia um garoto de seis ou sete anos com os joelhos cobertos por cascas de ferida. Ele encarou Helen, seus olhos cintilando na meia-luz, como se esperasse uma deixa.",
+      "source": "Clive Barker, Candyman",
+      "length": 233,
+      "id": 27
+    },
+    {
+      "text": "Ela repetiu as quatro palavras em sua mente. Eu vim por você. Se pretendiam ser uma ameaça, com certeza não foram proferidas como tal.",
+      "source": "Clive Barker, Candyman",
+      "length": 134,
+      "id": 28
+    },
+    {
+      "text": "A existência é aleatória. Sem padrão, a não ser o que imaginamos depois de ficar olhando por muito tempo. Sem sentido, a não ser o que decidimos dar. Não são as forças metafísicas vagas que moldam este mundo. Não é Deus quem mata as crianças. Não é o destino que trucida ou a sina de quem as dá de comer aos cães. Somos nós. Só nós.",
+      "source": "Alan Moore, Watchmen",
+      "length": 332,
+      "id": 29
+    },
+    {
+      "text": "Entendam, eu não estou preso aqui com vocês, vocês estão presos aqui comigo.",
+      "source": "Alan Moore, Watchmen",
+      "length": 76,
+      "id": 30
+    },
+    {
+      "text": "Um corpo vivo e um corpo morto contém o mesmo número de partículas. Estruturalmente não há diferença discernível. Vida e morte são abstrações não quantificáveis, por que deveria me importar?",
+      "source": "Alan Moore, Watchmen",
+      "length": 190,
+      "id": 31
+    },
+    {
+      "text": "Eu revirava a gaveta ao lado procurando fita adesiva. Mamãe queria a fita para prender o bilhete ao bebê. Estava escuro e eu vi a cabeça e os ombros de Al contra o para-brisa iluminado quando ele reduziu a velocidade da van. Segurei a beirada da pia para me equilibrar quando saímos do asfalto para o cascalho. Al apagou as luzes.",
+      "source": "Katherine Dunn, Geek Love",
+      "length": 330,
+      "id": 32
+    },
+    {
+      "text": "Roger lamentou por ele. Era um homem que pensava devagar, mas sabia que o que era útil e valioso não podia ser sacrificado por causa daquilo. Era bom pensar em Atlanta, que para muitos era uma estrela, dormindo em segurança em um quarto a cem metros dali.",
+      "source": "F. Scott Fitzgerald, Eu morreria por ti & outras histórias",
+      "length": 255,
+      "id": 33
+    },
+    {
+      "text": "A data do lançamento era 15 de abril. No dia 14, um silêncio indócil tomou conta das salas no escritório, e na loja abaixo os atendentes olhavam nervosos para os espaços vazios onde as pilhas ficariam e para as vitrines desocupadas onde três habilidosos vitrinistas passariam a noite dispondo o livro em quadrados e montes e pilhas e círculos e estrelas e paralelogramos.",
+      "source": "F. Scott Fitzgerald, Eu morreria por ti & outras histórias",
+      "length": 371,
+      "id": 34
+    },
+    {
+      "text": "Rodrick assistia a um programa sobre o que acontece com os astronautas depois que passam muito tempo no espaço. O programa falava que, quando eles voltavam à Terra, estavam mais altos do que antes de sair. E o motivo para isso é que não há gravidade no espaço, então as colunas deles se descomprimem, ou coisa do tipo.",
+      "source": "Jeff Kinney, Diário de um Banana: Rodrick é o cara",
+      "length": 318,
+      "id": 35
+    },
+    {
+      "text": "As cortinas que ela escolheu parecem de linho. De linho caro. A trama é aberta o bastante para que eu quase sempre possa identificar o estado de espírito de vocês. Consigo ver o rabo de cavalo da menina balançando enquanto ela termina a lição de casa. Consigo ver o menininho jogando bolas de tênis contra o teto a três metros e meio de distância, enquanto a sua esposa, de calça legging, se agacha na sala de estar, arrumando a bagunça do dia.",
+      "source": "Ashley Audrain, O Impulso",
+      "length": 444,
+      "id": 36
     }
   ]
 }
diff --git a/static/quotes/vietnamese.json b/static/quotes/vietnamese.json
index 276dd09f7..56f1657a8 100644
--- a/static/quotes/vietnamese.json
+++ b/static/quotes/vietnamese.json
@@ -1,10 +1,22 @@
 {
   "language": "vietnamese",
   "groups": [
-    [0, 100],
-    [101, 300],
-    [301, 600],
-    [601, 9999]
+    [
+      0,
+      100
+    ],
+    [
+      101,
+      300
+    ],
+    [
+      301,
+      600
+    ],
+    [
+      601,
+      9999
+    ]
   ],
   "quotes": [
     {
@@ -20,7 +32,7 @@
       "id": 2
     },
     {
-    "text": "Trong quan hệ với con người, hãy luôn nhớ rằng chúng ta đang giao tiếp với những sinh vật không những có lý trí mà còn có cảm xúc, họ rất dễ bị tổn thương bởi định kiến nhưng luôn có động lực khi có niềm tự hào và lòng kiêu hãnh.",
+      "text": "Trong quan hệ với con người, hãy luôn nhớ rằng chúng ta đang giao tiếp với những sinh vật không những có lý trí mà còn có cảm xúc, họ rất dễ bị tổn thương bởi định kiến nhưng luôn có động lực khi có niềm tự hào và lòng kiêu hãnh.",
       "source": "Đắc Nhân Tâm",
       "length": 229,
       "id": 3
@@ -30,6 +42,12 @@
       "source": "Đắc Nhân Tâm",
       "length": 230,
       "id": 4
+    },
+    {
+      "text": "Ngày mai anh không còn em nữa, không cho ai là tất cả. Để nỗi cô đơn theo anh đến một miền trời xa. Để nhắc cho anh biết bao ngày hạnh phúc êm đềm. Nhắc cho anh luôn còn lại một trái tim yêu em.",
+      "source": "Ngày mai em đi, Lê Hiếu",
+      "length": 194,
+      "id": 5
     }
   ]
-}
+}
\ No newline at end of file