Some fixes - this instead of self, etc..
Add color picker and entry