fixes and updates, add custom theme