Updated :- Add missing keywords +

Theme bug fixes