diff --git a/index.html b/index.html
index 6ae339a..43136d5 100644
--- a/index.html
+++ b/index.html
@@ -103,11 +103,11 @@
               <div class="flex flex-row space-x-4 justify-center px-2 mx-2">
                 <div class="flex items-center pl-4 border border-gray-200 rounded dark:border-gray-700 w-full">
                   <input id="bordered-radio-1" type="radio" value="" name="bordered-radio" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
-                  <label for="bordered-radio-1" class="w-full py-4 ml-2 text-sm font-medium text-black">Normal Mode</label>
+                  <label id="normal-mode" for="bordered-radio-1" class="w-full py-4 ml-2 text-sm font-medium text-black">Normal Mode</label>
                 </div>
                 <div class="flex items-center pl-4 border border-gray-200 rounded dark:border-gray-700 w-full">
                   <input checked id="bordered-radio-2" type="radio" value="" name="bordered-radio" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
-                  <label for="bordered-radio-2" class="w-full py-4 ml-2 text-sm font-medium text-black">Vim Mode</label>
+                  <label id="vim-mode" for="bordered-radio-2" class="w-full py-4 ml-2 text-sm font-medium text-black">Vim Mode</label>
                 </div>
               </div>
               <!-- Information card -->
diff --git a/src/AppSettings.ts b/src/AppSettings.ts
index 57ddddd..bf283fe 100644
--- a/src/AppSettings.ts
+++ b/src/AppSettings.ts
@@ -18,6 +18,7 @@ export interface Settings {
     vimMode: boolean
     theme: string
     font: string
+    font_size: number
     universes: Universes
 }
 
@@ -62,6 +63,7 @@ export class AppSettings {
   public vimMode: boolean = false
   public theme: string = "materialDark"
   public font: string = "SpaceMono"
+  public font_size: number = 22 
   public universes: Universes
 
   constructor() {
@@ -86,6 +88,7 @@ export class AppSettings {
       vimMode: this.vimMode,
       theme: this.theme,
       font: this.font,
+      font_size: this.font_size,
       universes: this.universes
     }
   }
@@ -94,6 +97,7 @@ export class AppSettings {
     this.universes = universes;
     this.vimMode = settings.vimMode;
     this.font = settings.font;
+    this.font_size = settings.font_size;
     localStorage.setItem('topos', JSON.stringify(this.data))
   }
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 6d99dc0..d9f1c50 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,14 +21,8 @@ import {
   template_universes,
 } from "./AppSettings";
 import { tryEvaluate } from "./Evaluator";
-import { materialDark } from "./themes/materialDark";
 import { oneDark } from "@codemirror/theme-one-dark";
 
-export const fontSizeModif = EditorView.theme(
-  {
-    "&": { fontSize: "22px", }
-  }
-)
 
 export class Editor {
   // Data structures for editor text management
@@ -37,6 +31,7 @@ export class Editor {
   local_index: number = 1;
   editor_mode: "global" | "local" | "init" = "local";
   fontSize: Compartment;
+  vimModeCompartment : Compartment;
   
 
   settings = new AppSettings();
@@ -102,6 +97,10 @@ export class Editor {
   font_size_slider: HTMLInputElement = document.getElementById('font-size-slider') as HTMLInputElement;
   font_size_witness: HTMLSpanElement = document.getElementById('font-size-witness') as HTMLSpanElement;
 
+  // Editor mode selection
+  normal_mode_button: HTMLButtonElement = document.getElementById('normal-mode') as HTMLButtonElement;
+  vim_mode_button: HTMLButtonElement = document.getElementById('vim-mode') as HTMLButtonElement;
+
   constructor() {
     // ================================================================================
     // Loading the universe from local storage
@@ -129,13 +128,20 @@ export class Editor {
     // ================================================================================
 
     this.fontSize = new Compartment();
+    this.vimModeCompartment = new Compartment();
     const vimPlugin = this.settings.vimMode ? vim() : [];
-    this.userPlugins = [
-      vimPlugin,
-    ];
+    const fontSizeModif = EditorView.theme( { 
+      "&": { 
+        fontSize: `${this.settings.font_size}px`,
+       },
+       ".cm-gutters": {
+          fontSize: `${this.settings.font_size}px`,
+       }
+    })
 
     this.editorExtensions = [
       this.fontSize.of(fontSizeModif),
+      this.vimModeCompartment.of(vimPlugin),
       editorSetup,
 			oneDark,
       rangeHighlighting(),
@@ -144,7 +150,6 @@ export class Editor {
         v;
         // This is the event listener for the editor
       }),
-      ...this.userPlugins,
     ];
 
     let dynamicPlugins = new Compartment();
@@ -307,6 +312,9 @@ export class Editor {
     );
 
     this.settings_button.addEventListener("click", () => {
+      // Query the current font size and set the slider to that value
+      const current_font_size = this.fontSize.get(this.view.state);
+      console.log(current_font_size)
       let modal_settings = document.getElementById('modal-settings');
       let editor = document.getElementById('editor');
       modal_settings?.classList.remove('invisible')
@@ -322,9 +330,9 @@ export class Editor {
 
     this.font_size_slider.addEventListener("input", () => {
       const new_value = this.font_size_slider.value;
-      // Change the font-size-witness font size to value
       this.font_size_witness.style.fontSize = `${new_value}px`;
       this.font_size_witness.innerHTML = `Font Size: ${new_value}px`;
+
       let new_font_size = EditorView.theme({
         "&": { fontSize : new_value + "px", },
         ".cm-gutters": { fontSize : new_value + "px", },
@@ -332,8 +340,17 @@ export class Editor {
       this.view.dispatch({
         effects: this.fontSize.reconfigure(new_font_size)
       });
+      this.settings.font_size = parseInt(new_value);
+    })
 
-      console.log(this.font_size_slider.value);
+    this.normal_mode_button.addEventListener("click", () => {
+      this.settings.vimMode = false;
+      this.view.dispatch({effects: this.vimModeCompartment.reconfigure([])});
+    })
+
+    this.vim_mode_button.addEventListener("click", () => {
+      this.settings.vimMode = true;
+      this.view.dispatch({effects: this.vimModeCompartment.reconfigure(vim())});
     })
 
     this.buffer_search.addEventListener("keydown", (event) => {