diff --git a/app/less/editor.less b/app/less/editor.less
index c4ac216..e5f045c 100644
--- a/app/less/editor.less
+++ b/app/less/editor.less
@@ -23,6 +23,10 @@
         color: @editor-text-color;
     }
 
+    .CodeMirror pre when (@editor-ligatures = true) {
+        font-variant-ligatures: contextual;
+    }
+
     .CodeMirror-code {
         margin-top: 50px;
         margin-bottom: 50%;
diff --git a/default/themes/default-dark/theme.less b/default/themes/default-dark/theme.less
index 5110ff9..2359506 100644
--- a/default/themes/default-dark/theme.less
+++ b/default/themes/default-dark/theme.less
@@ -50,7 +50,8 @@
 // ======
 
 // Text
-@editor-font-family: Monaco, "DejaVu Sans Mono", "Lucida Console", "Andale Mono", monospace;
+@editor-font-family: "Fira Code", Monaco, "DejaVu Sans Mono", "Lucida Console", "Andale Mono", monospace;
+@editor-ligatures: true;
 @editor-text-color: #b0bcd0;
 @editor-background-color: #282C34;
 
diff --git a/default/themes/default/theme.less b/default/themes/default/theme.less
index 5eaad54..5ce42b5 100644
--- a/default/themes/default/theme.less
+++ b/default/themes/default/theme.less
@@ -50,7 +50,8 @@
 // ======
 
 // Text
-@editor-font-family: Monaco, "DejaVu Sans Mono", "Lucida Console", "Andale Mono", monospace;
+@editor-font-family: "Fira Code", Monaco, "DejaVu Sans Mono", "Lucida Console", "Andale Mono", monospace;
+@editor-ligatures: true;
 @editor-text-color: #1d2426;
 @editor-background-color: #fff;