lots of cleanup and changes for initial post and custom theming