Merge branch 'stage' into ck44
Merge branch 'stage' into ck44
Theme Engine [2/8]

Conflicts:
	main.mk

 Author:    BigBrother1984 <stevewatersy@gmail.com>
update path from deviant to candykat
fix my theme derps

Signed-off-by: errantzebra845 <errantzebra845@gmail.com>