Re-Update of old emotes
Merge remote-tracking branch 'origin/master'

Conflicts:
	theme
Revert "Re-Update of old emotes"

This reverts commit cd2c512cce41728962d734b7170209603e0d8aa6.

Conflicts:
	theme