> - The switch from desktop PCs that might take 100-200W before even considering the screen, to Laptops that might use 50W on average.

The total electricity consumption for computers is much higher then in the past. You just don't see it, because the consumption moved to data centers.