some updates, theme still not working properly