Beginning to theme the app.
merging changes