Fully functional version FINALY!

just some cleanup, maybe some comments and move the Colors to theme.