diff --git a/elisp/org-setup.el b/elisp/org-setup.el
index 2562147..1842efb 100644
--- a/elisp/org-setup.el
+++ b/elisp/org-setup.el
@@ -11,6 +11,9 @@
 (add-hook 'org-shiftdown-final-hook 'windmove-down)
 (add-hook 'org-shiftright-final-hook 'windmove-right)
 
+;; open org file with everything folded
+(setq org-startup-folded t)
+
 ;; org publish
 (require 'ox-publish)
 (setq org-publish-project-alist
@@ -59,16 +62,11 @@
    (scheme     . t)
    (shell      . t)))
 
-;;bullets in org-mode
-;;(require 'org-bullets)
-;;(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
-
 ;; default apps to open files with org-mode
 (setq org-file-apps
    (quote
     ((auto-mode . emacs)
      ("\\.mm\\'" . default)
-     ("\\.x?html?\\'" . "seamonkey")
      ("\\.pdf\\'" . "emacsclient %s")
      ("\\.djvu\\'" . "djview %s"))))