diff --git a/README.md b/README.md
index 833439c..f1aace4 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,5 @@
 
 ## Credits/Sources
 - [james-d/SimpleMVP](https://github.com/james-d/SimpleMVP/tree/master/src/examples/mvp) -> Demonstration of JavaFX Model/View/Controller application
+- [FXMisc/RichtTextFX](https://github.com/FXMisc/RichTextFX) -> Library for handling rich text and line numbers
+- [richtextfx-demos](https://github.com/FXMisc/RichTextFX/blob/master/richtextfx-demos/README.md) -> Examples and demos of how to use RichTextFX, including [Java Keywords Demo](https://github.com/FXMisc/RichTextFX/blob/master/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/JavaKeywordsAsyncDemo.java)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f4f3602..89d0e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,13 @@
       <version>16-ea+7</version>
     </dependency>
 
+    <!-- RichTextFX -->
+    <dependency>
+        <groupId>org.fxmisc.richtext</groupId>
+        <artifactId>richtextfx</artifactId>
+        <version>0.10.5</version>
+    </dependency>
+
     <!-- JUnit 5 -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -35,7 +42,7 @@
       <version>5.8.0-M1</version>
     </dependency>
 
-    <!-- TextFX -->
+    <!-- TestFX -->
     <dependency>
       <groupId>org.testfx</groupId>
       <artifactId>testfx-core</artifactId>
diff --git a/src/main/resources/fxml/Main.fxml b/src/main/resources/fxml/Main.fxml
index cf31755..7ef2edb 100644
--- a/src/main/resources/fxml/Main.fxml
+++ b/src/main/resources/fxml/Main.fxml
@@ -13,6 +13,8 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.text.TextFlow?>
+<?import org.fxmisc.flowless.VirtualizedScrollPane?>
+<?import org.fxmisc.richtext.CodeArea?>
 
 <BorderPane 
   prefWidth="600"
@@ -59,21 +61,18 @@
       </ScrollPane>
 
       <!-- Editor -->
-      <ScrollPane>
-      <content>
-        <TextFlow
-          id="editor"
-          prefHeight="${editor.parent.height}"
-          prefWidth="${editor.parent.width}"/>
-      </content>
-      </ScrollPane>
+      <VirtualizedScrollPane>
+        <content>
+          <CodeArea fx:id="editor"/>
+        </content>
+      </VirtualizedScrollPane>
   
     </items>
     </SplitPane>
   </center>
   
   <bottom>
-    <HBox id="modeline" prefHeight="25.0">
+    <HBox fx:id="modeline" prefHeight="25.0">
       <Label text="Modeline :)"/>
     </HBox>
   </bottom>