diff --git a/thoom-emacs/modules/thoom-editing.el b/thoom-emacs/modules/thoom-editing.el
index 3de51e3..0d338e2 100644
--- a/thoom-emacs/modules/thoom-editing.el
+++ b/thoom-emacs/modules/thoom-editing.el
@@ -4,17 +4,11 @@
   :ensure t
   :bind (([remap move-beginning-of-line] . mwim-beginning)
          ([remap move-end-of-line] . mwim-end))
-  :init
-  (defun thoom/mwim-org-heading-beginning ()
-    (mwim-point-at
-      (move-beginning-of-line nil)
-      (skip-syntax-forward "_ " (line-end-position))))
-  :config
-  (setq mwim-beginning-position-functions
-        '(thoom/mwim-org-heading-beginning
-          mwim-code-beginning
-          mwim-comment-beginning
-          mwim-line-beginning)))
+  :custom
+  (mwim-beginning-position-functions
+   '(mwim-line-beginning
+     mwim-code-beginning
+     mwim-comment-beginning)))
 
 ;; Allow movement during isearch
 ;; C/M-v move  to next/previous match not currently visible
diff --git a/thoom-emacs/modules/thoom-org.el b/thoom-emacs/modules/thoom-org.el
index 64091a1..3a741e6 100644
--- a/thoom-emacs/modules/thoom-org.el
+++ b/thoom-emacs/modules/thoom-org.el
@@ -9,6 +9,7 @@
          ("C-j" . nil))
   :hook ((org-mode . visual-line-mode))
   :custom
+  (org-special-ctrl-a/e 'reversed)
   (org-todo-keywords '((sequence "TODO(t)" "BLOCKED(b)" "|" "DONE(d)")))
   (org-image-actual-width '(800)))