Template cleanup, add support for room features and item only actions.