Finished UI improvements and created theme support