Remove unused theme; Re-organize styles