Web/Update: More Theming Features. :) And Theme Fixes.
Web/Update: More Theme Updates! Soon to Finish.
Merge branch 'master' of https://github.com/AquaFlameCMS/AquaFlameCMS_Trinity into ghbb

Conflicts:
	advanced.php
	classes/armory.class.php
	panel/server_information.php