Fixes for Theme support
Reverted theme binding