Beginning integration of v1.0 -> Theme & index