Revert "Reorder Theme header"

This reverts commit 58568783c7bd62da010022ed9787dec105731ab0.

(cherry picked from commit 4b96726b7d08be028098cc8c05a37e22308b623a)
Revert "Revert "Add Themes category""

This reverts commit bc9d13961b2581c1159c2a7b74604418d474f53a.

Conflicts:
	res/values/strings.xml
orig file
THEME ENGINE (2/2)

(cherry picked from commit 089ff348c63eb5494f05b955fe2b3fbc6f86d496)
Revert "orig file"

This reverts commit aa039ea816ece5b66a3cea17e86261bd32ff27b3.