Theme change+other minor fixes