Updated GUI to unify theme