changed almost the whole structure of the bundle, especially the part of resolving theme