diff --git a/main.py b/main.py
index 000f6b6..7dac268 100755
--- a/main.py
+++ b/main.py
@@ -6,24 +6,31 @@
     tokens = []
     token = ""
     text = ""
-    mode = "normal"
+    mode = "normal" # normal/note/text
     for symbol in code:
-        if symbol == " " or symbol == "\n":
-            if token == "":
+        if symbol == " " or symbol == "\t" or symbol == "\n":
+            lowered = token.lower()
+            if lowered == "":
                 pass
-            elif token == "BeginNote":
+            elif lowered == "beginnote":
                 mode = "note"
-            elif token == "EndNote":
+            elif lowered == "endnote":
                 mode = "normal"
-            elif token == "BeginText":
+            elif lowered == "begintext":
                 mode = "text"
-            elif token == "EndText":
-                tokens.append(("Text", text[1:-8]))
+            elif lowered == "endtext":
+                tokens.append(("text", text[1:-8]))
                 mode = "normal"
                 text = ""
             elif token != "":
                 if mode == "normal":
-                    tokens.append(("Symbol", token))
+                    keywords = ["newlang", "done", "set", "to", "endset",
+                                "if", "then", "else", "endif"]
+                    if lowered in keywords:
+                        type = "keyword"
+                    else:
+                        type = "symbol"
+                    tokens.append((type, lowered))
             token = ""
         else:
             token += symbol