Tiffany theme improvements