Modifications to pass theme-check requeriments