diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 09698657..e635ebce 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -308,7 +308,6 @@
   `vim.diagnostics.nvim-lint.linters.*.required_files`.
 - Add global function `nvf_lint` under
   `vim.diagnostics.nvim-lint.lint_function`.
-- Deprecate `vim.scrollOffset` in favor of `vim.options.scrolloff`.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
@@ -396,10 +395,6 @@
 
 [Haskex](https://github.com/haskex):
 
-[solarized-osaka.nvim]: https://github.com/craftzdog/solarized-osaka.nvim
-
-- Add [solarized-osaka.nvim] theme
-
 [img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim
 
 - Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and
diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 0a5733ab..91d8ef28 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -18,7 +18,7 @@
     showSignColumn = "signcolumn";
 
     # 2025-02-07
-    scrollOffset = "scrolloff";
+    scrollOff = "scrolloff";
   };
 in {
   imports = concatLists [
diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix
index 2f3934ae..195ef5e7 100644
--- a/modules/neovim/init/basic.nix
+++ b/modules/neovim/init/basic.nix
@@ -6,10 +6,11 @@
   inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) optionalAttrs;
-  inherit (lib.types) enum bool str either;
+  inherit (lib.types) enum bool str int either;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter;
   inherit (lib.nvim.binds) pushDownDefault;
+  inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) luaInline;
 
   cfg = config.vim;
@@ -21,6 +22,12 @@ in {
       description = "Hide search highlight so it doesn't stay highlighted";
     };
 
+    scrollOffset = mkOption {
+      type = int;
+      default = 8;
+      description = "Start scrolling this number of lines from the top or bottom of the page.";
+    };
+
     syntaxHighlighting = mkOption {
       type = bool;
       default = !config.vim.treesitter.highlight.enable;
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index 9c5e380c..2b427871 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -212,17 +212,4 @@ in {
     '';
     styles = ["dark" "light" "dark_dimmed" "dark_default" "light_default" "dark_high_contrast" "light_high_contrast" "dark_colorblind" "light_colorblind" "dark_tritanopia" "light_tritanopia"];
   };
-  solarized-osaka = {
-    setup = {transparent ? false, ...}: ''
-      require("solarized-osaka").setup({
-        transparent = ${boolToString transparent},
-        styles = {
-          comments = { italic = false },
-          keywords = { italic = false },
-        }
-      })
-
-      vim.cmd.colorscheme("solarized-osaka")
-    '';
-  };
 }
diff --git a/npins/sources.json b/npins/sources.json
index 940a7466..c4aef85e 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -2248,19 +2248,6 @@
       "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0",
       "hash": "1hbm4fnw51qdp0nz83fcxbvnxjq2k57a37w6dp0wz6wkcx7cwxw9"
     },
-    "solarized-osaka": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "craftzdog",
-        "repo": "solarized-osaka.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "f796014c14b1910e08d42cc2077fef34f08e0295",
-      "url": "https://github.com/craftzdog/solarized-osaka.nvim/archive/f796014c14b1910e08d42cc2077fef34f08e0295.tar.gz",
-      "hash": "0jy2hk4fc210jih30ybvisr9pliya1s3nazw4d131vh5k4p1xqi6"
-    },
     "sqls-nvim": {
       "type": "Git",
       "repository": {