Put annotations in the right place

Put annotations in the theme defintion rather than in the public.xml
file.

Change-Id: I078b7676423be4cd362df251be630c1617da030c
2 files changed