Updated more functions and some themes