diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index 608542b..0edfa0c 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -123,6 +123,7 @@
 
 ;; Org-mode
 (require 'siren-htmlize)
+(require 'siren-ob-go)
 (require 'siren-ob-http)
 (require 'siren-ob-mermaid)
 (require 'siren-org-mode)
diff --git a/modules/org-mode/siren-ob-go.el b/modules/org-mode/siren-ob-go.el
new file mode 100644
index 0000000..be64144
--- /dev/null
+++ b/modules/org-mode/siren-ob-go.el
@@ -0,0 +1,22 @@
+;;; siren-ob-go.el --- jimeh's Emacs Siren: ob-go configuration.
+
+;;; Commentary:
+
+;; Basic configuration for ob-go.
+
+;;; Code:
+
+(require 'siren-org-mode)
+
+(use-package ob-go
+  :defer t
+
+  :hook
+  (org-mode . siren-ob-go-setup)
+
+  :init
+  (defun siren-ob-go-setup ()
+    (require 'ob-go)))
+
+(provide 'siren-ob-go)
+;;; siren-ob-go.el ends here
diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el
index aa87d84..8efd9ea 100644
--- a/modules/org-mode/siren-org-mode.el
+++ b/modules/org-mode/siren-org-mode.el
@@ -31,25 +31,55 @@
   (org-mode . siren-org-mode-setup)
 
   :custom
+  (org-adapt-indentation nil)
   (org-blank-before-new-entry '((heading . auto) (plain-list-item . nil)))
   (org-catch-invisible-edits 'show)
   (org-ctrl-k-protect-subtree t)
   (org-export-backends '(ascii html icalendar latex md))
   (org-export-with-section-numbers nil)
   (org-export-with-sub-superscripts '{})
+  (org-hide-leading-stars nil)
   (org-return-follows-link t)
   (org-special-ctrl-a/e t)
   (org-special-ctrl-k t)
-  (org-adapt-indentation nil)
-  (org-hide-leading-stars nil)
+  (org-src-fontify-natively t)
+  (org-src-preserve-indentation t)
+  (org-src-tab-acts-natively t)
+  (org-src-window-setup 'current-window)
 
   (org-directory (if (file-directory-p "~/Dropbox/org")
                      "~/Dropbox/org" "~/org"))
 
+  (org-babel-load-languages
+   '((awk . t)
+     (calc . t)
+     (clojure . t)
+     (css . t)
+     (dot . t)
+     (emacs-lisp . t)
+     (forth . t)
+     (fortran . t)
+     (haskell . t)
+     (js . t)
+     (latex . t)
+     (lisp . t)
+     (makefile . t)
+     (org . t)
+     (perl . t)
+     (plantuml . t)
+     (python . t)
+     (ruby . t)
+     (sass . t)
+     (scheme . t)
+     (shell . t)
+     (sql . t)
+     (sqlite . t)))
+
   :init
   (defun siren-org-mode-setup ()
     (setq fill-column 80
-          whitespace-action '(auto-cleanup))
+          whitespace-action '(auto-cleanup)
+          tab-width 2)
 
     (setcar (nthcdr 4 org-emphasis-regexp-components) 20)
     (org-set-emph-re 'org-emphasis-regexp-components
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 74fd21c..1c19335 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -122,6 +122,7 @@
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("nginx-mode" . "a2bab83c2eb233d57d76b236e7c141c2ccc97005")
  ("ns-auto-titlebar" . "60273e764bf8d95abc40dd2fdc23af87ea9ee33b")
+ ("ob-go" . "2067ed55f4c1d33a43cb3f6948609d240a8915f5")
  ("ob-http" . "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7")
  ("ob-mermaid" . "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9")
  ("osx-trash" . "0f1dc052d0a750b8c75f14530a4897f5d4324b4e")