Moving theme specific stuff out of CiiController