Started using the proper theme's colours
Rough pass at restyling the UI