Moved back to one css file. Better that way.
Added a little bit on Swift2