diff --git a/libs/remix-core-plugin/src/lib/code-parser.ts b/libs/remix-core-plugin/src/lib/code-parser.ts
index 671ba72c1d..fb5897df41 100644
--- a/libs/remix-core-plugin/src/lib/code-parser.ts
+++ b/libs/remix-core-plugin/src/lib/code-parser.ts
@@ -4,7 +4,8 @@ import { sourceMappingDecoder } from '@remix-project/remix-debug'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import { Compiler } from '@remix-project/remix-solidity'
 
-import { AstNode, CompilationError, CompilationResult, CompilationSource, helper } from '@remix-project/remix-solidity-ts'
+import { AstNode, CompilationError, CompilationResult, CompilationSource } from '@remix-project/remix-solidity'
+import { helper } from '@remix-project/remix-solidity'
 const SolidityParser = (window as any).SolidityParser = (window as any).SolidityParser || []
 
 const profile = {
@@ -104,6 +105,7 @@ export class CodeParser extends Plugin {
                     console.log('lineColumn', lineColumn)
                     allErrors.push({ error, lineColumn })
                 }
+                console.log('allErrors', allErrors)
                 await this.call('editor', 'addErrorMarker', allErrors)
             } else {
                 await this.call('editor', 'clearErrorMarkers', result.getSourceCode().sources)
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index 5c9d5064a5..bc1038ded4 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@remix-project/remix-solidity-ts",
+  "name": "@remix-project/remix-solidity",
   "version": "0.5.0",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
diff --git a/libs/remix-tests/src/compiler.ts b/libs/remix-tests/src/compiler.ts
index 2af2069c99..f16c925edc 100644
--- a/libs/remix-tests/src/compiler.ts
+++ b/libs/remix-tests/src/compiler.ts
@@ -3,7 +3,7 @@ import async from 'async'
 import path from 'path'
 import deepequal from 'deep-equal'
 import Log from './logger'
-import { Compiler as RemixCompiler } from '@remix-project/remix-solidity-ts'
+import { Compiler as RemixCompiler } from '@remix-project/remix-solidity'
 import { SrcIfc, CompilerConfiguration, CompilationErrors } from './types'
 const logger = new Log()
 const log = logger.logger
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index a765065d88..406bd731b9 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -370,9 +370,14 @@ export const EditorUI = (props: EditorUIProps) => {
       filePath = fileFromUrl.file
       const model = editorModelsState[filePath]?.model
 
+      const errorServerityMap = {
+        'error': MarkerSeverity.Error,
+        'warning': MarkerSeverity.Warning,
+        'info': MarkerSeverity.Info
+      }
       if (model) {
         const markerData: monaco.editor.IMarkerData = {
-          severity: MarkerSeverity.Error,
+          severity: errorServerityMap[marker.severity],
           startLineNumber: lineColumn.start.line + 1,
           startColumn: lineColumn.start.column + 1,
           endLineNumber: lineColumn.end.line + 1,
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 409590c800..d2d944f693 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -10,7 +10,7 @@
     "importHelpers": true,
     "target": "es2015",
     "module": "commonjs",
-    "typeRoots": ["node_modules/@types"],
+    "typeRoots": ["node_modules/@types", "dist/libs/**/*.d.ts"],
     "lib": ["es2017", "es2019", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
@@ -28,7 +28,7 @@
         "dist/libs/remix-simulator/src/index.js"
       ],
       "@remix-project/remix-solidity": [
-        "dist/libs/remix-solidity/src/index.js"
+        "dist/libs/remix-solidity/src/index"
       ],
       "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
       "@remix-project/remix-url-resolver": [