Added some more attributes. Moved the themes into a themes.xml file. Renamed a few things so they are more descriptive. Updated gradle files. Other various changes...