Major theme and code updates