Changed all _s instances with jolie_theme