Update for Caustic changes and fix GL20 mode

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>