diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el
index 503aa1d..d040fd1 100644
--- a/.emacs.d/gnus.el
+++ b/.emacs.d/gnus.el
@@ -1,27 +1,22 @@
-(setq gnus-select-method '(nntp "news.eternal-september.org"))
+(setq gnus-select-method '(nntp "news.gmane.org"))
 (setq gnus-secondary-select-methods
       '((nnmaildir "gmail"
                    (directory "~/documents/mail/gmail/"))
         (nnmaildir "ninthfloor"
                    (directory "~/documents/mail/ninthfloor/"))
-        (nnmaildir "arch"
-                   (directory "~/documents/mail/arch/"))
         (nnmaildir "aethon"
                    (directory "~/documents/mail/aethon/"))
         (nnmaildir "ryuslash"
-                   (directory "~/documents/mail/ryuslash.org/"))
-        (nntp "news.gmane.org")))
-
+                   (directory "~/documents/mail/ryuslash.org/"))))
+         ; (nntp "news.gmane.org"))
 (setq gnus-auto-subscribed-groups nil)
 (setq gnus-save-newsrc-file nil)
 (setq gnus-read-newsrc-file nil)
 (setq gnus-novice-user t)
 (setq gnus-article-truncate-lines nil)
-
 (setq message-send-mail-function 'message-send-mail-with-sendmail)
 (setq sendmail-program "/usr/bin/msmtp")
 (setq message-sendmail-extra-arguments '("-a" "gmail"))
-
 ;; (setq gnus-parameters
 ;;       '(("gmail"
 ;;          (display . all))
@@ -29,16 +24,19 @@
 ;;          (display . all)
 ;;         ("arch"
 ;;          (display . all)))))
-
 (setq gnus-permanently-visible-groups
-      "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX")
-
+      (eval-when-compile
+        (regexp-opt '("gmail:inbox"
+                      "aethon:inbox"
+                      "ninthfloor:inbox"
+                      "ryuslash:inbox"))))
 (setq nntp-marks-is-evil t)
-
 (setq gnus-check-new-newsgroups nil)
-
 (setq gnus-posting-styles
       '((".*"
+         (address "tom@ryuslash.org")
+         (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))
+        ("gmail:"
          (address "ryuslash@gmail.com")
          (eval (setq message-sendmail-extra-arguments '("-a" "gmail"))))
         ("ninthfloor:"
@@ -50,18 +48,10 @@
         ("aethon:"
          (address "thomas@aethon.nl")
          (signature-file "~/documents/work/aethon/signature.txt")
-         (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))
-        ("ryuslash:"
-         (address "tom@ryuslash.org")
-         (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash"))))))
-
-(setq user-mail-address "ryuslash@gmail.com")
+         (eval (setq message-sendmail-extra-arguments '("-a" "aethon"))))))
+(setq user-mail-address "tom@ryuslash.org")
 (setq user-full-name "Tom Willemsen")
 
-(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1)))
-(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1)))
-
 ;-----[ BBDB ]--------------------------------------------------------
 ;; (require 'bbdb)
 ;; (bbdb-initialize 'gnus 'message)