Updated backend functions and converted to theme wrapper