Updated and themed GUI.
Resolved merge conflicts.