Cleaned up theme code

Generated by commit b69902a74c70240ae06f987cf0017c9255357760; pushed by Travis build 36.