Some organizing. Added more themes. Some ctrp changes