complete revamp w/ new theme