diff --git a/adafruit_pyoa.py b/adafruit_pyoa.py
index da144d5..c4928af 100755
--- a/adafruit_pyoa.py
+++ b/adafruit_pyoa.py
@@ -40,6 +40,7 @@
     from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
 except ImportError:
     pass
+import audiocore
 import audioio
 from adafruit_display_text.label import Label
 from adafruit_button import Button
@@ -53,13 +54,13 @@ class PYOA_Graphics:
     """A choose your own adventure game framework."""
 
     def __init__(self):
-        self.root_group = displayio.Group(max_size=15)
+        self.root_group = displayio.Group()
         self._display = board.DISPLAY
-        self._background_group = displayio.Group(max_size=1)
+        self._background_group = displayio.Group()
         self.root_group.append(self._background_group)
-        self._text_group = displayio.Group(max_size=1)
+        self._text_group = displayio.Group()
         self.root_group.append(self._text_group)
-        self._button_group = displayio.Group(max_size=2)
+        self._button_group = displayio.Group()
         self.root_group.append(self._button_group)
 
         if self._display.height > 250:
@@ -203,10 +204,10 @@ def _display_buttons(self, card):
         self._right_button.label = button02_text
         if button01_text and not button02_text:
             # show only middle button
-            self._button_group.append(self._middle_button.group)
+            self._button_group.append(self._middle_button)
         if button01_text and button02_text:
-            self._button_group.append(self._right_button.group)
-            self._button_group.append(self._left_button.group)
+            self._button_group.append(self._right_button)
+            self._button_group.append(self._left_button)
 
     def _display_background_for(self, card):
         """If there's a background on card, display it.
@@ -346,7 +347,7 @@ def play_sound(self, filename, *, wait_to_finish=True, loop=False):
         except OSError as err:
             raise OSError("Could not locate sound file", filename) from err
 
-        wavedata = audioio.WaveFile(self._wavfile)
+        wavedata = audiocore.WaveFile(self._wavfile)
         self._speaker_enable.value = True
         self.audio.play(wavedata, loop=loop)
         if loop or not wait_to_finish:
diff --git a/docs/conf.py b/docs/conf.py
index 4a571ca..fa8aeb6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,32 +21,23 @@
     "sphinx.ext.todo",
 ]
 
-# TODO: Please Read!
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
 autodoc_mock_imports = [
-    "rtc",
-    "supervisor",
-    "pulseio",
+    "analogio",
+    "audiocore",
     "audioio",
     "displayio",
-    "neopixel",
     "microcontroller",
-    "adafruit_touchscreen",
-    "adafruit_bitmap_font",
-    "adafruit_display_text",
-    "adafruit_esp32spi",
-    "secrets",
-    "adafruit_sdcard",
+    "neopixel",
+    "pulseio",
+    "rtc",
     "storage",
-    "adafruit_io",
-    "adafruit_button",
-    "adafruit_cursorcontrol",
+    "supervisor",
     "terminalio",
 ]
 
-
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3.4", None),
     "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
diff --git a/requirements.txt b/requirements.txt
index 5f97a2d..a8bcb26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Unlicense
 
-# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
-#
-# SPDX-License-Identifier: Unlicense
-
 Adafruit-Blinka
+adafruit-circuitpython-display-button
+adafruit-circuitpython-display-text
+adafruit-circuitpython-touchscreen