diff --git a/tools/opf-label-and-issue-validator.md b/tools/opf-label-and-issue-validator.md
index 724c786db2108771dff91f71fa1b27239fbc1a8d..d5079078bea0d6ca11b5063b1a7a270ab4c8d4d6 100644
--- a/tools/opf-label-and-issue-validator.md
+++ b/tools/opf-label-and-issue-validator.md
@@ -1,40 +1,60 @@
 # OPF Issue types-and-labels
 
 
-# Issue Types
 
+| Issue type | Current Label Color | Offical Color |
+|:-:|:-:|:-:|
+| Personal | ~"Personal" | `#44AD8E` |  
+| Team | ~"Team" | `#44AD8E` |    
 
-| Issue type | Label | Offical Color | Purpose |
-|:-:|:-:|:-:|:-:|
-| [bug-report.md](../.gitlab/issue_templates/bug-report.md) | ~"Bug" | `#FF0000` | Issue used for bug report |
-| [incident-report.md](../.gitlab/issue_templates/incident-report.md) | ~"Incident" | `#FF0000` | Issue used for incident report |     
-| [design-task.md](../.gitlab/issue_templates/design-task.md) | ~"Design" |`#1D5299` | Issue to describe design task |
-| [general-task.md](../.gitlab/issue_templates/general-task.md) |  ~"General"   | `#1D5299` | Issue for general purpose  | 
-| [implementation-task.md](../.gitlab/issue_templates/implementation-task.md) | ~"Implementation" | `#1D5299` | Issue to describe coding etc.. |
-| [documentation-task.md](../.gitlab/issue_templates/documentation-task.md) | ~"Documentation" | `#1D5299` | Issue to describe documentation |
-| [question-and-answer.md](../.gitlab/issue_templates/question-and-answer.md) | ~"Q&A" | `#1D5299` | Question and Answer issue |
-| [User Story.md](../.gitlab/issue_templates/user-story.md) | ~"User Story" | `#1D5299` | User Story issue |
-| [Job Story.md](../.gitlab/issue_templates/job-story.md)  | ~"Job Story" | `#1D5299` | Job Story issue |
-| [Assignment](../.gitlab/issue_templates/assignment.md) | ~"Assignment" | `#2B7BE5` | General assignment for student |
-   
 
 
 
-# Issue States as labels
 
-| Issue type | Label | Offical Color | Purpose  |
+# Issue Types
+
+	
+In English
+		
+| Issue type | Current Label Color | Offical Color |
+|:-:|:-:|:-:|
+| bug-report.md | ~"Bug" | `#FF0000` |
+| incident-report.md | ~"Incident" | `#FF0000` |     
+| design-task.md | ~"Design" |`#1D5299` |
+| general-task.md |  ~"General"   | `#1D5299` |       
+| implementation-task.md | ~"Implementation" | `#1D5299` |
+| documentation-task.md | ~"Documentation" | `#1D5299` |
+| question-and-answer.md | ~"Q&A" | `#1D5299` |
+| User Story.md | ~"User Story" | `#1D5299` |
+| Job Story.md  | ~"Job Story" | `#1D5299` |
+| Assignment | ~"Assignment" | `#2B7BE5` |
+
+
+Suomeksi
+
+| Issue type | Current Label Color | Offical Color | Tarkoitus |
 |:-:|:-:|:-:|:-:|
-| Backlog | ~"Backlog" | `#F0A921` | Issue waiting in the Backlog |
-| Estimate | ~"Estimate" | `#F0A921` | Issue in estimation phase |
-| Doing | ~"Doing" | `#F0A921` | Issue under work |
-| Fixed Verify | ~"Fixed Verify" | `#9E760D` | Bug report issue which is fixed by coder |
-| Verified | ~"Verified" | `#69D121` | Bug report issue which is verified by tester/coder |
-| Waiting Review | ~"Waiting Review" | `#F0A921` | Issue waiting for general review |
-| Reviewed | ~"Reviewed" | `#69D121` | Issue which has passed review |
-| Done | ~"Done" | `#29510D` | Issue which is done and reviewed |
-| Personal | ~"Personal" | `#44AD8E` | Personal task for team member | 
-| Team | ~"Team" | `#44AD8E` | Team task for whole team | 
+| vika-raportti.md | ~"Bug"  | `#FF0000` ||
+| poikkeama-raportti.md | ~"Incident" | `#FF0000` ||
+| suunnittelu-tehtävä.md | ~"Design" | `#1D5299` | |
+| yleinen-tehtävä.md | ~"General" | `#1D5299` ||
+| toteutus-tehtävä.m | ~"Implementation" | `#1D5299` ||
+| Dokumentointi-tehtävä.md | ~"Documentation" | `#1D5299` ||
+| kysymys-ja-vastaus.md | ~"Q&A" | `#1D5299` ||
+| harjoitustehtava.md  | ~"Assignment" | `#2B7BE5` ||
+| UserStory-Käyttäjätarina.md | ~"User Story"  | `#1D5299` ||
+ 
+# Issue State Labels
+
+| Issue type | Current Label Color | Offical Color |
+|:-:|:-:|:-:|
+| Estimate | ~"Estimate" | `#F0A921` |
+| Doing | ~"Doing" | `#F0A921` |
+| Fixed Verify | ~"Fixed Verify" | `#9E760D` | 
+| Verified | ~"Verified" | `#69D121` |
+| Waiting Review | ~"Waiting Review" | `#F0A921` |
+| Reviewed | ~"Reviewed" | `#69D121` |
+| Done | ~"Done" | `#29510D` |
 
 Reserved Labels for future:
 
-