Theming: Undo unintended "default style" changes

Change-Id: Id2a185f90a4e27ec2c74d63278a4abe7e3983b20
Reviewed-by: Orgad Shaneh <orgads@gmail.com>