made some stuff conditional to use the same theme for the components