Latest changes from Khris and stylesheet loading