diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 3f5e3aa377..9ff56ce26c 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -111,7 +111,7 @@ class Cleaner
         end
         if ARGV.debug?
           old_perms = path.stat.mode & 0777
-          puts "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}" if perms != old_perms
+          odebug "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}" if perms != old_perms
         end
         path.chmod perms
       end
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index bcb718b2cc..4494dee7fb 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -50,7 +50,7 @@ module Homebrew
 
     first_warning = true
     methods.each do |method|
-      $stderr.puts "Checking #{method}" if args.debug?
+      $stderr.puts Formatter.headline("Checking #{method}", color: :magenta) if args.debug?
       unless checks.respond_to?(method)
         Homebrew.failed = true
         puts "No check available by the name: #{method}"
diff --git a/Library/Homebrew/dev-cmd/extract.rb b/Library/Homebrew/dev-cmd/extract.rb
index f1a5c39c8c..65ecef960e 100644
--- a/Library/Homebrew/dev-cmd/extract.rb
+++ b/Library/Homebrew/dev-cmd/extract.rb
@@ -135,14 +135,14 @@ module Homebrew
         file = repo/path
         result = Git.last_revision_of_file(repo, file, before_commit: rev)
         if result.empty?
-          ohai "Skipping revision #{rev} - file is empty at this revision" if ARGV.debug?
+          odebug "Skipping revision #{rev} - file is empty at this revision" if ARGV.debug?
           next
         end
 
         test_formula = formula_at_revision(repo, name, file, rev)
         break if test_formula.nil? || test_formula.version == version
 
-        ohai "Trying #{test_formula.version} from revision #{rev} against desired #{version}" if ARGV.debug?
+        odebug "Trying #{test_formula.version} from revision #{rev} against desired #{version}" if ARGV.debug?
       end
       odie "Could not find #{name}! The formula or version may not have existed." if test_formula.nil?
     else
@@ -181,7 +181,7 @@ module Homebrew
             brew extract --force --version=#{version} #{name} #{destination_tap.name}
         EOS
       end
-      ohai "Overwriting existing formula at #{path}" if ARGV.debug?
+      odebug "Overwriting existing formula at #{path}" if ARGV.debug?
       path.delete
     end
     ohai "Writing formula for #{name} from revision #{rev} to #{path}"
diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb
index ae1c670637..a30313846c 100644
--- a/Library/Homebrew/formula_versions.rb
+++ b/Library/Homebrew/formula_versions.rb
@@ -44,7 +44,7 @@ class FormulaVersions
   rescue *IGNORED_EXCEPTIONS => e
     # We rescue these so that we can skip bad versions and
     # continue walking the history
-    ohai "#{e} in #{name} at revision #{rev}", e.backtrace if ARGV.debug?
+    odebug "#{e} in #{name} at revision #{rev}", e.backtrace if ARGV.debug?
   rescue FormulaUnavailableError
     nil
   ensure
diff --git a/Library/Homebrew/os/mac/keg.rb b/Library/Homebrew/os/mac/keg.rb
index 65d4ceb029..9cf35e39d9 100644
--- a/Library/Homebrew/os/mac/keg.rb
+++ b/Library/Homebrew/os/mac/keg.rb
@@ -5,7 +5,7 @@ class Keg
     return if file.dylib_id == id
 
     @require_relocation = true
-    puts "Changing dylib ID of #{file}\n  from #{file.dylib_id}\n    to #{id}" if ARGV.debug?
+    odebug "Changing dylib ID of #{file}\n  from #{file.dylib_id}\n    to #{id}" if ARGV.debug?
     MachO::Tools.change_dylib_id(file, id, strict: false)
   rescue MachO::MachOError
     onoe <<~EOS
@@ -20,7 +20,7 @@ class Keg
     return if old == new
 
     @require_relocation = true
-    puts "Changing install name in #{file}\n  from #{old}\n    to #{new}" if ARGV.debug?
+    odebug "Changing install name in #{file}\n  from #{old}\n    to #{new}" if ARGV.debug?
     MachO::Tools.change_install_name(file, old, new, strict: false)
   rescue MachO::MachOError
     onoe <<~EOS