diff --git a/use_cases_diagram.dot b/use_cases_diagram.dot
index a688eb0..a794e24 100644
--- a/use_cases_diagram.dot
+++ b/use_cases_diagram.dot
@@ -2,52 +2,61 @@ digraph G{
 	ratio=0.75;
 	rankdir="LR";
 	node[shape=box];
-  // Styling
-	"[A1] User Registration"[fillcolor="#6699ff", style=filled];
-	"[A2] User Login"[fillcolor="#6699ff", style=filled];
-	"[A3] Add a Class"[fillcolor="#6699ff", style=filled];
-	"[A4] Drop a Class"[fillcolor="#6699ff", style=filled];
-	"[A5] Change Password"[fillcolor="#6699ff", style=filled];
-	"[A6] Forgot Password"[fillcolor="#6699ff", style=filled];
-	"[A8] Logout"[fillcolor="#6699ff", style=filled];
-	"[A9] Contact Admins"[fillcolor="#6699ff", style=filled];
-
-  "[D] Edit Deck"[fillcolor="#ccff99", style=filled];
-
+  // Styling:
+  // Accounts
+	"[A1] User Registration"[fillcolor="#9ce3ff", style=filled];
+	"[A2] User Login"[fillcolor="#9ce3ff", style=filled];
+	"[A3] Add a Class"[fillcolor="#9ce3ff", style=filled];
+	"[A4] Drop a Class"[fillcolor="#9ce3ff", style=filled];
+	"[A5] Password Change"[fillcolor="#9ce3ff", style=filled];
+	"[A6] Password Reset"[fillcolor="#9ce3ff", style=filled];
+	"[A8] User Logout"[fillcolor="#9ce3ff", style=filled];
+	"[A9] Contact Admin"[fillcolor="#9ce3ff", style=filled];
+	"[A10] Configure Account Notifications"[fillcolor="#9ce3ff", style=filled];
+
+  // Flashcards
   "[F1] Push Flashcard"[fillcolor="#ff5050", style=filled];
   "[F2] Edit Card"[fillcolor="#ff5050", style=filled];
   "[F3] Pull Flashcard"[fillcolor="#ff5050", style=filled];
-  "[F6] Select Blanks"[fillcolor="#ff5050", style=filled];
-  "[F10] View Class Feed"[fillcolor="#ff5050", style=filled];
+  "[F4] Flag Inappropriate Cards"[fillcolor="#ff5050", style=filled];
+  "[F5] Filter Flashcards"[fillcolor="#ff5050", style=filled];
+  "[F6] Blank Out Words"[fillcolor="#ff5050", style=filled];
+  "[F7] Fix Flashcard"[fillcolor="#ff5050", style=filled];
+  "[F8] Hide Cards"[fillcolor="#ff5050", style=filled];
+  "[F9] View Class Feed"[fillcolor="#ff5050", style=filled];
+
+  // Decks
+  "[D1] Remove Card from Deck"[fillcolor="#ccff99", style=filled];
+  "[D2] View Deck"[fillcolor="#ccff99", style=filled];
 
-	"[R40] Configure Notifications"[fillcolor="#ffaaff", style=filled];
+  // Study
+  "[R1] Study Deck"[fillcolor="#ffeeaa", style=filled];
 
-	"User" [shape=none, shapefile="stick.png"];
+	"User" [shape=none, shapefile="stick.png" style=none];
 
   //Graph
 	"User"->"[A1] User Registration";
 
   "[A1] User Registration"->"[A2] User Login";
   "[A2] User Login"->"[A2] User Login";
-  "[A2] User Login"->"[A6] Forgot Password";
-  "[A2] User Login" -> "[A5] Change Password";
-  "[A2] User Login" -> "[R40] Configure Notifications";
+  "[A2] User Login"->"[A6] Password Reset";
+  "[A2] User Login" -> "[A5] Password Change";
   "[A2] User Login"->"[A3] Add a Class";
-  "[A2] User Login"->"[A8] Logout";
-  "[A3] Add a Class"->"[F10] View Class Feed";
+  "[A2] User Login"->"[A8] User Logout";
+  "[A3] Add a Class"->"[F9] View Class Feed";
   "[A3] Add a Class"->"[A4] Drop a Class"
   "[A4] Drop a Class"->"[A3] Add a Class"
-  "[A8] Logout"->"[A2] User Login";
-  "[A9] Contact Admins"
-
-  "[F1] Push Flashcard"->"[F6] Select Blanks"
-  "[F1] Push Flashcard"->"[F10] View Class Feed";
-  "[F2] Edit Card" -> "[F6] Select Blanks";
-  "[F6] Select Blanks"->"[F10] View Class Feed";
-  "[F10] View Class Feed"->"[F1] Push Flashcard";
-  "[F10] View Class Feed"->"[F3] Pull Flashcard";
-  "[F10] View Class Feed" ->"[R16] Study Deck";
-  "[F10] View Class Feed" ->"[D] Edit Deck";
+  "[A8] User Logout"->"[A2] User Login";
+  "[A9] Contact Admin"
+
+  "[F1] Push Flashcard"->"[F6] Blank Out Words"
+  "[F1] Push Flashcard"->"[F9] View Class Feed";
+  "[F2] Edit Card" -> "[F6] Blank Out Words";
+  "[F6] Blank Out Words"->"[F9] View Class Feed";
+  "[F9] View Class Feed"->"[F1] Push Flashcard";
+  "[F9] View Class Feed"->"[F3] Pull Flashcard";
+  "[F9] View Class Feed" ->"[R16] Study Deck";
+  "[F9] View Class Feed" ->"[D] Edit Deck";
 
   "[D] Edit Deck" -> "Unpull Cards";
   "[D] Edit Deck" -> "[F2] Edit Card";