diff --git a/.atom/config.json b/.atom/config.json
new file mode 100644
index 000000000..f6b59770b
--- /dev/null
+++ b/.atom/config.json
@@ -0,0 +1,11 @@
+{
+  "editor": {
+    "fontSize": 16
+  },
+  "core": {
+    "themes": [
+      "Atom - Dark",
+      "IR_Black"
+    ]
+  }
+}
diff --git a/.atom/packages/README.md b/.atom/packages/README.md
new file mode 100644
index 000000000..540b6949c
--- /dev/null
+++ b/.atom/packages/README.md
@@ -0,0 +1 @@
+All packages in this directory will be automatically loaded
diff --git a/.atom/packages/Readme.md b/.atom/packages/Readme.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.atom/themes/README.md b/.atom/themes/README.md
new file mode 100644
index 000000000..dbedd5e13
--- /dev/null
+++ b/.atom/themes/README.md
@@ -0,0 +1 @@
+All themes in this directory will be automatically loaded
diff --git a/.atom/user.css b/.atom/user.css
index f53057581..d63ad257e 100644
--- a/.atom/user.css
+++ b/.atom/user.css
@@ -1,8 +1,8 @@
-// User styles
+/* User styles */
 .tree-view {
 
 }
 
 .editor {
 
-}
\ No newline at end of file
+}
diff --git a/Rakefile b/Rakefile
index 2a14471ac..ad33f5a86 100644
--- a/Rakefile
+++ b/Rakefile
@@ -90,13 +90,7 @@ task "create-dot-atom" do
   end
 
   `rm -rf "#{DOT_ATOM_PATH}"`
-  `mkdir "#{DOT_ATOM_PATH}"`
-
-  `cp "#{dot_atom_template_path}/user.coffee" "#{DOT_ATOM_PATH}"`
-  `cp "#{dot_atom_template_path}/user.css" "#{DOT_ATOM_PATH}"`
-  `cp -r "#{dot_atom_template_path}/packages" "#{DOT_ATOM_PATH}"`
-  `cp -r "#{ATOM_SRC_PATH}/themes" "#{DOT_ATOM_PATH}"`
-  `cp "#{ATOM_SRC_PATH}/vendor/themes/IR_Black.tmTheme" "#{DOT_ATOM_PATH}/themes"`
+  `cp -r #{dot_atom_template_path} #{DOT_ATOM_PATH}`
 end
 
 desc "Clone default bundles into vendor/bundles directory"