Moved some system.prop options to the common side