Revert "Rewrite"

This reverts commit 14cad88fbcd416f6adb25f561c72ebdc397ff91f.

Conflicts:
	yoshi-theme.el