Simplex theme and small changes