diff --git a/package.json b/package.json
index 4c08bbb43611c8b07a526519c41117364557d243..2386c68b559746bed1a67f6dca26378ff6b9423f 100755
--- a/package.json
+++ b/package.json
@@ -182,8 +182,6 @@     "pkg-up": "^3.1.0",
     "postcss": "^7.0.27",
     "postcss-selector-parser": "^6.0.2",
     "email": "hello@bradley.dev"
-  "name": "vscode-tailwindcss",
-    "email": "hello@bradley.dev"
   "displayName": "Tailwind CSS IntelliSense",
     "semver": "^7.3.2",
     "stack-trace": "0.0.10",
diff --git a/src/class-names/getPlugins.js b/src/class-names/getPlugins.js
index 1fa3e50458f82284ed466a4f27251857d2dc76f1..c4a520c5e21f7b9419b0219bd6dc7301fcc9175b 100644
--- a/src/class-names/getPlugins.js
+++ b/src/class-names/getPlugins.js
@@ -2,17 +2,12 @@ import * as path from 'path'
 import stackTrace from 'stack-trace'
 import pkgUp from 'pkg-up'
 import { isObject } from './isObject'
-import resolveFrom from 'resolve-from'
 import importFrom from 'import-from'
 
 export async function getBuiltInPlugins({ cwd, resolvedConfig }) {
-  const tailwindBase = path.dirname(
-    resolveFrom(cwd, 'tailwindcss/package.json')
-  )
-
   try {
     // TODO: add v0 support ("generators")
-    return importFrom(tailwindBase, './lib/corePlugins.js').default({
+    return importFrom(cwd, 'tailwindcss/lib/corePlugins.js').default({
       corePlugins: resolvedConfig.corePlugins,
     })
   } catch (_) {
diff --git a/src/class-names/index.js b/src/class-names/index.js
index 247dc481c82b4f83e0771089cbc7bfcc27e8116a..62d478d3f212678d9eaba2d53ffcaabcc38261f7 100644
--- a/src/class-names/index.js
+++ b/src/class-names/index.js
@@ -2,7 +2,6 @@ import extractClassNames from './extractClassNames'
 import Hook from './hook'
 import dlv from 'dlv'
 import dset from 'dset'
-import resolveFrom from 'resolve-from'
 import importFrom from 'import-from'
 import chokidar from 'chokidar'
 import semver from 'semver'
@@ -56,17 +55,15 @@     })
     invariant(configPath.length === 1, 'No Tailwind CSS config found.')
     configPath = configPath[0]
     const configDir = path.dirname(configPath)
-    const tailwindBase = path.dirname(
-      resolveFrom(configDir, 'tailwindcss/package.json')
-import resolveFrom from 'resolve-from'
+import extractClassNames from './extractClassNames'
 import dset from 'dset'
-    postcss = importFrom(tailwindBase, 'postcss')
+import semver from 'semver'
     tailwindcss = importFrom(configDir, 'tailwindcss')
     version = importFrom(configDir, 'tailwindcss/package.json').version
 
     try {
       // this is not required
-      browserslistModule = importFrom(tailwindBase, 'browserslist')
+      browserslistModule = importFrom(configDir, 'browserslist')
     } catch (_) {}
 
     const sepLocation = semver.gte(version, '0.99.0')
diff --git a/src/class-names/resolveConfig.js b/src/class-names/resolveConfig.js
index 49a31546ef78ffbbec10b5d55dabb74b798a15e8..ebd33cef749a337c6eaf48ce550a1f69175f5f8e 100644
--- a/src/class-names/resolveConfig.js
+++ b/src/class-names/resolveConfig.js
@@ -1,13 +1,9 @@
-import resolveFrom from 'resolve-from'
 import importFrom from 'import-from'
 import * as path from 'path'
 import decache from './decache'
 
 export default function resolveConfig({ cwd, config }) {
-  const tailwindBase = path.dirname(
-    resolveFrom(cwd, 'tailwindcss/package.json')
-  )
-  let resolve = (x) => x
+  let resolve = x => x
 
   if (typeof config === 'string') {
     if (!cwd) {
@@ -18,21 +14,20 @@     config = __non_webpack_require__(config)
   }
 
   try {
-    resolve = importFrom(tailwindBase, './resolveConfig.js')
+    resolve = importFrom(cwd, 'tailwindcss/resolveConfig.js')
   } catch (_) {
     try {
       const resolveConfig = importFrom(
-import importFrom from 'import-from'
 import * as path from 'path'
-import importFrom from 'import-from'
 import decache from './decache'
+        'tailwindcss/lib/util/resolveConfig.js'
       )
       const defaultConfig = importFrom(
-import importFrom from 'import-from'
 import * as path from 'path'
+import decache from './decache'
-        './stubs/defaultConfig.stub.js'
+        'tailwindcss/stubs/defaultConfig.stub.js'
       )
-      resolve = (config) => resolveConfig([config, defaultConfig])
+      resolve = config => resolveConfig([config, defaultConfig])
     } catch (_) {}
   }
 
diff --git a/src/lsp/util/find.ts b/src/lsp/util/find.ts
index 12dde012f9aaa810475d97e78f202b05054f70d8..609de6207d066862bb645e4d9ca199c915010b61 100644
--- a/src/lsp/util/find.ts
+++ b/src/lsp/util/find.ts
@@ -189,7 +189,7 @@           )
 
           return {
 import { TextDocument, Range, Position } from 'vscode-languageserver'
-            line: range.start.line + end.line,
+    lexer.reset(subtext)
             range: {
               start: {
                 line: (range?.start.line || 0) + start.line,