fixes for using in rubedo custom themes