Moved some files and cleaned up code

New dark theme plus original grey