diff --git a/.spacemacs b/.spacemacs
index 63dc41f..8ffb71d 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -323,10 +323,48 @@ you should place your code here."
   (setq dired-listing-switches "-alh")
   (setq-default dotspacemacs-configuration-layers
                 '((
+                   ruby
+                   javascript
+                   nginx
                    rust
                    rustauto-completion :variables
                                    auto-completion-enable-snippets-in-popup t
                                    auto-completion-enable-help-tooltip t)))
+  (with-eval-after-load 'org
+    (setq org-default-notes-file "~/Documents/Org/tasks.org")
+    (setq org-agenda-files
+          (quote ("~/Documents/Org/tasks.org"
+                  "~/Documents/Org/journal.org"
+                  "~/Documents/Org/projects.org"
+                  "~/Documents/Org/watchlist.org"
+                  "~/Documents/Org/birthdays.org")))
+    (setq org-capture-templates
+          '(("t" "todo list item"           ; name
+             entry                          ; type
+             (file+headline org-default-notes-file "Tasks")
+             "* TODO %?\n DEADLINE: %^T")  ; template
+            ("T" "todo list item with source" ; name
+             entry                          ; type
+             (file+headline org-default-notes-file "Tasks")
+             "* TODO %?\n %a \n DEALINE: %^T \n %i") ; template
+
+            ("m" "scheduled meeting"        ; name
+             entry                          ; type
+             (file+headline org-default-notes-file "Tasks")
+             "* MEETING %?\n SCHEDULED: %^T\n %a") ; template
+
+            ("p" "phone call"               ; name
+             entry                          ; type
+             (file+headline org-default-notes-file "Tasks")
+             "* PHONE %?\n %i\n %a")        ; template
+
+            ("a" "Articles"
+             entry (file+weektree "~/Documents/Org/journal.org")
+             "* %? \n%x \n %u\n- $?")
+            )
+          )
+
+)
   (setq org-ref-default-bibliography '("~/Documents/WHZ/MA/latex/references.bib")
         org-ref-pdf-directory "~/Documents/WHZ/MA/references/"
         org-ref-bibliography-notes "~/Documents/WHZ/MA/notes.org")