updated to new theme. WIP