diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 51367a329..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-name: Release Build
-
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-    - '*' # Push events to matching any tag format, i.e. 1.0, 20.15.10
-
-env:
-  PLUGIN_NAME: obsidian-day-planner # Change this to the name of your plugin-id folder
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: '14.x' # You might need to adjust this value to your own version
-    - name: Build
-      id: build
-      run: | 
-        npm install
-        npm run build --if-present
-        mkdir ${{ env.PLUGIN_NAME }}
-        cp dist/main.js manifest.json ${{ env.PLUGIN_NAME }}
-        zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-        ls
-        echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)"
-    - name: Test
-      id: test
-      run: |
-        npm run test
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        VERSION: ${{ github.ref }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: ${{ github.ref }}
-        draft: false
-        prerelease: false
-    - name: Upload zip file
-      id: upload-zip
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./${{ env.PLUGIN_NAME }}.zip 
-        asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip 
-        asset_content_type: application/zip
-    - name: Upload main.js
-      id: upload-main
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./dist/main.js
-        asset_name: main.js
-        asset_content_type: text/javascript
-    - name: Upload manifest.json
-      id: upload-manifest
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./manifest.json
-        asset_name: manifest.json
-        asset_content_type: application/json
-    - name: Upload styles.css
-      id: upload-css
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./styles.css
-        asset_name: styles.css
-        asset_content_type: text/css
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 048167137..221a11199 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,39 +1,34 @@
-name: CI Test
+name: Test
 
 on:
   pull_request:
-      branches:
-        - main
-  push:
-    # Sequence of patterns matched against refs/tags
     branches:
-      - feature/*
+      - main
 
 env:
-  PLUGIN_NAME: obsidian-day-planner # Change this to the name of your plugin-id folder
+  PLUGIN_NAME: time-block-planner
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: '14.x' # You might need to adjust this value to your own version
-    - name: Build
-      id: build
-      run: | 
-        npm install
-        npm run build --if-present
-        mkdir ${{ env.PLUGIN_NAME }}
-        cp dist/main.js manifest.json ${{ env.PLUGIN_NAME }}
-        zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-        ls
-        echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)"
-    - name: Test
-      id: test
-      run: |
-        npm run test
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "16.x"
+
+      - name: Build
+        run: npm install
+
+      - name: Lint
+        run: npm run lint
+
+      - name: TypeScript
+        run: npm run typescript
+
+      - name: Test
+        run: npm run test