diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4c975d..ca35544 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,9 +42,9 @@ jobs:
       # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
       run: |
         source actions-ci/install.sh
-    - name: Pip install pylint, Sphinx, pre-commit
+    - name: Pip install Sphinx, pre-commit
       run: |
-        pip install --force-reinstall pylint Sphinx sphinx-rtd-theme pre-commit
+        pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
     - name: Library version
       run: git describe --dirty --always --tags
     - name: Pre-commit hooks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8810708..43d1385 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,17 +18,25 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pycqa/pylint
-    rev: pylint-2.7.1
+    rev: v2.11.1
     hooks:
     -   id: pylint
         name: pylint (library code)
         types: [python]
-        exclude: "^(docs/|examples/|setup.py$)"
--   repo: local
-    hooks:
-    -   id: pylint_examples
-        name: pylint (examples code)
+        args:
+          - --disable=consider-using-f-string,duplicate-code
+        exclude: "^(docs/|examples/|tests/|setup.py$)"
+    -   id: pylint
+        name: pylint (example code)
         description: Run pylint rules on "examples/*.py" files
-        entry: /usr/bin/env bash -c
-        args: ['([[ ! -d "examples" ]] || for example in $(find . -path "./examples/*.py"); do pylint --disable=missing-docstring,invalid-name,consider-using-f-string $example; done)']
-        language: system
+        types: [python]
+        files: "^examples/"
+        args:
+        - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
+    -   id: pylint
+        name: pylint (test code)
+        description: Run pylint rules on "tests/*.py" files
+        types: [python]
+        files: "^tests/"
+        args:
+        - --disable=missing-docstring,consider-using-f-string,duplicate-code
diff --git a/.pylintrc b/.pylintrc
index eee47e3..8d537b3 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -253,7 +253,7 @@ ignore-docstrings=yes
 ignore-imports=yes
 
 # Minimum lines number of a similarity.
-min-similarity-lines=50
+min-similarity-lines=12
 
 
 [BASIC]
diff --git a/adafruit_rgb_display/rgb.py b/adafruit_rgb_display/rgb.py
index 4a5ab2c..50e9e63 100644
--- a/adafruit_rgb_display/rgb.py
+++ b/adafruit_rgb_display/rgb.py
@@ -22,7 +22,7 @@
 except ImportError:
     import ustruct as struct
 
-import adafruit_bus_device.spi_device as spi_device
+from adafruit_bus_device import spi_device
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git"
diff --git a/adafruit_rgb_display/ssd1351.py b/adafruit_rgb_display/ssd1351.py
index 50f062d..9ae2cb1 100644
--- a/adafruit_rgb_display/ssd1351.py
+++ b/adafruit_rgb_display/ssd1351.py
@@ -113,8 +113,8 @@ def __init__(
         y_offset=0,
         rotation=0
     ):
-        if baudrate > 16000000:  # Limit to Display Max Baudrate
-            baudrate = 16000000
+        baudrate = min(baudrate, 16000000)  # Limit to Display Max Baudrate
+
         super().__init__(
             spi,
             dc,
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000..88e6733
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+sphinx>=4.0.0
diff --git a/examples/rgb_display_fbcp.py b/examples/rgb_display_fbcp.py
index 540ec40..63b210e 100644
--- a/examples/rgb_display_fbcp.py
+++ b/examples/rgb_display_fbcp.py
@@ -9,7 +9,7 @@
 import digitalio
 import board
 from PIL import Image, ImageDraw
-import adafruit_rgb_display.st7789 as st7789
+from adafruit_rgb_display import st7789
 
 # definitions from linux/fb.h
 FBIOGET_VSCREENINFO = 0x4600
diff --git a/examples/rgb_display_minipitftstats.py b/examples/rgb_display_minipitftstats.py
index a3ad651..1f625ed 100644
--- a/examples/rgb_display_minipitftstats.py
+++ b/examples/rgb_display_minipitftstats.py
@@ -8,7 +8,7 @@
 import digitalio
 import board
 from PIL import Image, ImageDraw, ImageFont
-import adafruit_rgb_display.st7789 as st7789
+from adafruit_rgb_display import st7789
 
 
 # Configuration for CS and DC pins (these are FeatherWing defaults on M0/M4):
diff --git a/examples/rgb_display_minipitfttest.py b/examples/rgb_display_minipitfttest.py
index 32771a9..c418229 100644
--- a/examples/rgb_display_minipitfttest.py
+++ b/examples/rgb_display_minipitfttest.py
@@ -5,7 +5,7 @@
 import board
 
 from adafruit_rgb_display.rgb import color565
-import adafruit_rgb_display.st7789 as st7789
+from adafruit_rgb_display import st7789
 
 # Configuration for CS and DC pins for Raspberry Pi
 cs_pin = digitalio.DigitalInOut(board.CE0)
diff --git a/examples/rgb_display_pillow_demo.py b/examples/rgb_display_pillow_demo.py
index 1e1ab76..f2ce7cf 100644
--- a/examples/rgb_display_pillow_demo.py
+++ b/examples/rgb_display_pillow_demo.py
@@ -15,12 +15,12 @@
 import digitalio
 import board
 from PIL import Image, ImageDraw, ImageFont
-import adafruit_rgb_display.ili9341 as ili9341
-import adafruit_rgb_display.st7789 as st7789  # pylint: disable=unused-import
-import adafruit_rgb_display.hx8357 as hx8357  # pylint: disable=unused-import
-import adafruit_rgb_display.st7735 as st7735  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1351 as ssd1351  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1331 as ssd1331  # pylint: disable=unused-import
+from adafruit_rgb_display import ili9341
+from adafruit_rgb_display import st7789  # pylint: disable=unused-import
+from adafruit_rgb_display import hx8357  # pylint: disable=unused-import
+from adafruit_rgb_display import st7735  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1351  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1331  # pylint: disable=unused-import
 
 # First define some constants to allow easy resizing of shapes.
 BORDER = 20
diff --git a/examples/rgb_display_pillow_image.py b/examples/rgb_display_pillow_image.py
index 38eb063..2bfff48 100644
--- a/examples/rgb_display_pillow_image.py
+++ b/examples/rgb_display_pillow_image.py
@@ -14,12 +14,12 @@
 import digitalio
 import board
 from PIL import Image, ImageDraw
-import adafruit_rgb_display.ili9341 as ili9341
-import adafruit_rgb_display.st7789 as st7789  # pylint: disable=unused-import
-import adafruit_rgb_display.hx8357 as hx8357  # pylint: disable=unused-import
-import adafruit_rgb_display.st7735 as st7735  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1351 as ssd1351  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1331 as ssd1331  # pylint: disable=unused-import
+from adafruit_rgb_display import ili9341
+from adafruit_rgb_display import st7789  # pylint: disable=unused-import
+from adafruit_rgb_display import hx8357  # pylint: disable=unused-import
+from adafruit_rgb_display import st7735  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1351  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1331  # pylint: disable=unused-import
 
 # Configuration for CS and DC pins (these are PiTFT defaults):
 cs_pin = digitalio.DigitalInOut(board.CE0)
diff --git a/examples/rgb_display_pillow_stats.py b/examples/rgb_display_pillow_stats.py
index 9ed6db1..e7716c9 100644
--- a/examples/rgb_display_pillow_stats.py
+++ b/examples/rgb_display_pillow_stats.py
@@ -16,12 +16,12 @@
 import digitalio
 import board
 from PIL import Image, ImageDraw, ImageFont
-import adafruit_rgb_display.ili9341 as ili9341
-import adafruit_rgb_display.st7789 as st7789  # pylint: disable=unused-import
-import adafruit_rgb_display.hx8357 as hx8357  # pylint: disable=unused-import
-import adafruit_rgb_display.st7735 as st7735  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1351 as ssd1351  # pylint: disable=unused-import
-import adafruit_rgb_display.ssd1331 as ssd1331  # pylint: disable=unused-import
+from adafruit_rgb_display import ili9341
+from adafruit_rgb_display import st7789  # pylint: disable=unused-import
+from adafruit_rgb_display import hx8357  # pylint: disable=unused-import
+from adafruit_rgb_display import st7735  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1351  # pylint: disable=unused-import
+from adafruit_rgb_display import ssd1331  # pylint: disable=unused-import
 
 # Configuration for CS and DC pins (these are PiTFT defaults):
 cs_pin = digitalio.DigitalInOut(board.CE0)