More BT fixes
Add BT theme