Add back base theme to /layout/ and use android: prefixes consistently.