You are correct, Tobias.
There is one component in rupakkhandha which is sanidassana. That is “paccuppanna rupa” or “rupa that we are seeing at the present moment” which are only “vanna rupa” as well.
The past and future parts of rupakkhandha are anidassana.
