Theme Support

Bug Fixes