Latest fixes from Khris and stylesheet loading