Fix mistakes and streamline prefs, add opacity