FIX: Only add separator when there is a theme, otherwise file path is not found properly