More Work on Theme page