Made theme compatible with rfmedia changes