diff --git a/docs/configuration.org b/docs/configuration.org
index 899c3df..91f01f7 100644
--- a/docs/configuration.org
+++ b/docs/configuration.org
@@ -3018,9 +3018,22 @@ require('orgmode').setup({
 :CUSTOM_ID: virt_cookies
 :END:
 
+Virtual cookies display the progress of TODO headings with children by indicating the proportion of DONE children.
+
 You can toggle Virtual cookies on the fly by executing command =:Org cookie_mode= when in a org buffer.
 This additionally sets the buffer variable =vim.b.org_cookie_mode= to =true= or =false=, depending on the current state.
 
+#+begin_src lua
+require('orgmode').setup({
+ ui = {
+ virt_cookies = {
+ enabled = true,
+ type = '/',
+ },
+ }
+})
+#+end_src
+
 Currently this only applies Virtual cookies to headlines.
 
 Uses the following highlights:

diff --git a/ftplugin/org.lua b/ftplugin/org.lua
index 6bc4213..b5c82b5 100644
--- a/ftplugin/org.lua
+++ b/ftplugin/org.lua
@@ -19,7 +19,7 @@ if config.org_startup_indented then
 end
 
 if config.ui.virt_cookies.enabled then
- require('orgmode.ui.virtcookie').new(bufnr, config.ui.virt_cookies.type):attach()
+ require('orgmode.ui.virtcookie'):new(bufnr, config.ui.virt_cookies.type):attach()
 end
 
 vim.bo.modeline = false
diff --git a/lua/orgmode/org/global.lua b/lua/orgmode/org/global.lua
index f2879f0..5f0c260 100644
--- a/lua/orgmode/org/global.lua
+++ b/lua/orgmode/org/global.lua
@@ -99,13 +99,13 @@ local build = function(orgmode)
 require('orgmode.ui.virtual_indent').toggle_buffer_indent_mode()
 end,
 cookie_mode = function()
- local virtcookie = require('orgmode.ui.virtcookie').get()
+ local virtcookie = require('orgmode.ui.virtcookie'):get()
 if virtcookie then
 virtcookie:toggle()
 end
 end,
 cookie_type = function()
- local virtcookie = require('orgmode.ui.virtcookie').get()
+ local virtcookie = require('orgmode.ui.virtcookie'):get()
 if virtcookie then
 virtcookie:toggle_cookie_type()
 end
diff --git a/lua/orgmode/ui/virtcookie.lua b/lua/orgmode/ui/virtcookie.lua
index c9928fd..ab08531 100644
--- a/lua/orgmode/ui/virtcookie.lua
+++ b/lua/orgmode/ui/virtcookie.lua
@@ -1,6 +1,7 @@
 local org = require('orgmode')
 
 ---@alias OrgVirtCookieType '/' | '%' The type of cookie to default to when no "real" cookie exists
+---@alias OrgCookieWatchers table<integer, OrgVirtCookie> A mapping of buffer ids to watchers
 
 ---@class OrgVirtCookie Updates Headline Cookies for Progress using Virtual Text
 ---@field private bufnr integer Buffer Watcher is attached to
@@ -9,34 +10,31 @@ local org = require('orgmode')
 ---@field private ns_id integer
 local OrgVirtCookie = {
 ns_id = vim.api.nvim_create_namespace('orgmode.ui.cookie'),
+ ---@type OrgCookieWatchers
+ watchers = {},
 }
 
----@alias OrgCookieWatchers table<integer, OrgVirtCookie> A mapping of buffer ids to watchers
-
----@type OrgCookieWatchers
-local watchers = {}
-
 ---Get all currently registered cookie watchers
 ---@return OrgCookieWatchers
-function OrgVirtCookie.watchers()
- return watchers
+function OrgVirtCookie:getWatchers()
+ return self.watchers
 end
 
 ---Gets an existing OrgCookieWatcher for the given buffer if it exists
 ---@param bufnr? integer Buffer to get the watcher for
 ---@return OrgVirtCookie?
-function OrgVirtCookie.get(bufnr)
+function OrgVirtCookie:get(bufnr)
 bufnr = bufnr or vim.api.nvim_get_current_buf()
- local watcher = OrgVirtCookie.watchers()[bufnr]
+ local watcher = OrgVirtCookie:getWatchers()[bufnr]
 return watcher
 end
 
 ---Creates a new headline watcher
 ---@param bufnr? integer Buffer to watch, if unspecified then uses the current buffer
 ---@param cookie_type? OrgVirtCookieType
-function OrgVirtCookie.new(bufnr, cookie_type)
+function OrgVirtCookie:new(bufnr, cookie_type)
 bufnr = bufnr or vim.api.nvim_get_current_buf()
- local watcher = OrgVirtCookie.get(bufnr)
+ local watcher = OrgVirtCookie:get(bufnr)
 if watcher then
 return watcher
 end
@@ -45,7 +43,7 @@ function OrgVirtCookie.new(bufnr, cookie_type)
 attached = false,
 cookie_type = cookie_type or '/',
 }, { __index = OrgVirtCookie })
- watchers[this.bufnr] = this
+ self.watchers[this.bufnr] = this
 
 vim.api.nvim_create_autocmd('BufDelete', {
 buffer = this.bufnr,
@@ -55,7 +53,7 @@ function OrgVirtCookie.new(bufnr, cookie_type)
 end,
 })
 
- return watchers[this.bufnr]
+ return self.watchers[this.bufnr]
 end
 
 ---@param new_cookie_type OrgVirtCookieType
@@ -251,7 +249,7 @@ function OrgVirtCookie:attach()
 vim.b[self.bufnr].org_cookie_mode = true
 vim.b[self.bufnr].org_cookie_type = self.cookie_type
 
- watchers[self.bufnr] = self
+ self.watchers[self.bufnr] = self
 self:_update_cookies_in_range(0, vim.api.nvim_buf_line_count(self.bufnr) - 1)
 
 -- We cant use `nvim_set_decoration_provider()` here because of a
@@ -314,7 +312,7 @@ end
 ---Completely removes the watcher, including from tracked watchers
 function OrgVirtCookie:delete()
 self:detach()
- watchers[self.bufnr] = nil
+ self.watchers[self.bufnr] = nil
 end
 
 return OrgVirtCookie

diff --git a/lua/orgmode/ui/virtcookie.lua b/lua/orgmode/ui/virtcookie.lua
index c9928fd..c2b239b 100644
--- a/lua/orgmode/ui/virtcookie.lua
+++ b/lua/orgmode/ui/virtcookie.lua
@@ -82,7 +82,8 @@ end
 function OrgVirtCookie._parent_headlines(headline)
 local located_headlines = {}
 local count = 0
- while true do
+
+ repeat
 count = count + 1
 local parent = headline:get_parent_headline()
 
@@ -92,7 +93,8 @@ function OrgVirtCookie._parent_headlines(headline)
 
 table.insert(located_headlines, parent)
 headline = parent
- end
+ until not parent or not parent.headline
+
 return located_headlines
 end
 

diff --git a/lua/orgmode/colors/highlights.lua b/lua/orgmode/colors/highlights.lua
index 3601119..2885cdb 100644
--- a/lua/orgmode/colors/highlights.lua
+++ b/lua/orgmode/colors/highlights.lua
@@ -73,9 +73,9 @@ function M.link_highlights()
 ['@org.edit_src'] = 'Visual',
 
 -- For cookie extmarks (applicable if enabled)
- ['@org.cookie.delimiter'] = 'Delimiter',
- ['@org.cookie.sign'] = 'Special',
- ['@org.cookie.number'] = 'Number',
+ ['@org.cookie.delimiter'] = 'VirtualTextInfo',
+ ['@org.cookie.sign'] = 'VirtualTextInfo',
+ ['@org.cookie.number'] = 'VirtualTextInfo',
 }
 
 for src, def in pairs(links) do