diff --git a/cheat-sheet.txt b/cheat-sheet.txt
deleted file mode 100644
index ddd8cdd..0000000
--- a/cheat-sheet.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-C-M-Space : smartparens wrapping
-C-c C-c   : calculator (see init.el)
-C-h k <key-sequence>: lookup key sequence
-C-x 0 : close current window
-C-q <tab> : insert a <tab>
-M-x (un)tabify : (replace) tabs
-M-x describe-bindings : list of all mapped keys/commands
-M-p : fill-paragraph, works for doxygen as well
diff --git a/config.org b/config.org
index aced26d..5d3a693 100644
--- a/config.org
+++ b/config.org
@@ -866,7 +866,6 @@ Preserve indentation in SRC blocks
 )
 #+END_SRC
 
-
 ** Save symbol at point
 
 #+BEGIN_SRC emacs-lisp
@@ -948,3 +947,15 @@ This should normally be done by the init.el to load this configuration.
   (interactive)
   (org-babel-load-file my-config-file))
 #+END_SRC
+
+** Tips and Tricks
+
+*** Cheat-sheet
+
+| Key                   | Explanation                                               |
+|-----------------------+-----------------------------------------------------------|
+| C-h k <key-sequence>  | Lookup key sequencesmartparens wrapping                   |
+| C-q <key>             | Insert <key> quoted/explicitly. F.e. to insert a tab, ... |
+| M-x untabify/tabify   | Convert to spaces/tabs                                    |
+| M-x describe-bindings | List all mapped keys/commands                             |
+| M-q                   | Fill paragraph                                            |