Work on removing the dependency on the feather theme