Added some tags (but same color) + new classifications. Removed triple/double whitespaces