Add theme ability to this part and fix some stuff