More improvements to page and theme system. Too tired to care right now.