diff --git a/core/cubes/editor.el b/core/cubes/editor.el
index ca1ad33..8a3bf33 100644
--- a/core/cubes/editor.el
+++ b/core/cubes/editor.el
@@ -36,6 +36,20 @@
   "Enable the support for server mode in FG42." t)
 
 
+(defcube fg42/folding-cube
+  "This cube install ~origami~ which let you collapse and expand regions of text.
+
+For more info checkout [[https://github.com/gregsexton/origami.el]]"
+  (:title "Folding cube"
+         :flag folding
+         :flag-default t)
+  (fpkg/use origami
+    :bind
+    (("C-c TAB" . origami-toggle-node))
+    :config
+    (global-origami-mode t)))
+
+
 (defcube fg42/pinentry-cube
   "Pinentry cube with setup the =pinentry= program to be used within FG42."
   (:title "Pinentry cube"
@@ -127,11 +141,12 @@
                   "Fira Mono"))
         (size (or (plist-get fg42/font-cube-params :font-size)
                   12)))
-    ;; Sets the default font to fg42 font
-    (add-to-list 'default-frame-alist
-                 (cons 'font (format "%s-%d" font size)))
+    (when font
+      ;; Sets the default font to fg42 font
+      (add-to-list 'default-frame-alist
+                   (cons 'font (format "%s-%d" font size)))
 
-    (set-face-attribute 'default t :font font)))
+      (set-face-attribute 'default t :font font))))
 
 
 ;TODO: Replace this cube with a `theme-cube'
@@ -250,6 +265,7 @@
     (fg42/modeline-cube)
     (fg42/setup-modeline-format mline))
 
+  (fg42/folding-cube)
   (fg42/font-cube)
   (fg42/pinentry-cube)
   (fg42/exec-path-cube)