NEW: Added some Atom settings
NEW: Added some more aliases