from child to main theme

Change-Id: I65410815dbb606c175ac4067919856f377670991