large updates to theme and code/style organization